[m-rev.] diff: fix completion test results

[Simon Taylor]

On 08-Mar-2002, Zoltan Somogyi <zs at cs.mu.OZ.AU> wrote:
> On 08-Mar-2002, Simon Taylor <stayl at cs.mu.OZ.AU> wrote:
> >  completion.out: completion completion.inp
> > -	INPUTRC=completion.inputrc $(MDB) ./completion \
> > -		< completion.inp > completion.out 2>&1
> > +	INPUTRC=completion.inputrc $(MDB) ./completion < completion.inp 2>&1 | \
> > +		sed -e 's/There are [0-9]* debuggable modules, with a total of [0-9]* procedures./There are NNN debuggable modules, with a total of NNN procedures./' \
> > +		> completion.out 2>&1
> 
> The way all the other debugger test cases avoid this dependency is by
> having the command "register --quiet" at the start of the input script;
> the --quiet option was specifically intended for this purpose.


Estimated hours taken: 0.25

tests/debugger/Mmakefile:
tests/debugger/completion.inp:
tests/debugger/completion.exp:
tests/debugger/completion.exp2:
	Address Zoltan's review comment about my previous change.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.68
diff -u -u -r1.68 Mmakefile
--- Mmakefile	8 Mar 2002 06:59:32 -0000	1.68
+++ Mmakefile	8 Mar 2002 07:13:50 -0000
@@ -136,9 +136,8 @@
 
 # Set up readline to make it easier to use completion non-interactively.
 completion.out: completion completion.inp
-	INPUTRC=completion.inputrc $(MDB) ./completion < completion.inp 2>&1 | \
-		sed -e 's/There are [0-9]* debuggable modules, with a total of [0-9]* procedures./There are NNN debuggable modules, with a total of NNN procedures./' \
-		> completion.out 2>&1
+	INPUTRC=completion.inputrc $(MDB) ./completion \
+		< completion.inp > completion.out 2>&1
 
 debugger_regs.out: debugger_regs debugger_regs.inp
 	$(MDB) ./debugger_regs < debugger_regs.inp > debugger_regs.out 2>&1
Index: completion.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/completion.exp,v
retrieving revision 1.3
diff -u -u -r1.3 completion.exp
--- completion.exp	8 Mar 2002 06:59:32 -0000	1.3
+++ completion.exp	8 Mar 2002 07:14:49 -0000
@@ -1,6 +1,7 @@
        1:      1  1 CALL pred completion:main/2-0 (det) completion.m:13
 mdb> echo on
 Command echo enabled.
+mdb> register --quiet
 mdb> 
 ?                  down               maxdepth           return
 P                  e                  mindepth           s
@@ -46,8 +47,6 @@
 
 completion:sub1       completion:sub2       completion:sub2:sub3
 procedures completion:sub1
-Registering debuggable procedures... done.
-There are NNN debuggable modules, with a total of NNN procedures.
 List of procedures in module `completion:sub1'
 
 pred completion:sub1:zp/1-0 (det)
Index: completion.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/completion.exp2,v
retrieving revision 1.2
diff -u -u -r1.2 completion.exp2
--- completion.exp2	8 Mar 2002 06:59:32 -0000	1.2
+++ completion.exp2	8 Mar 2002 07:16:54 -0000
@@ -2,6 +2,8 @@
 mdb> echo on
 echo on
 Command echo enabled.
+mdb> register --quiet
+register --quiet
 mdb> 
 ?                  down               maxdepth           return
 P                  e                  mindepth           s
@@ -51,8 +53,6 @@
 completion:sub1       completion:sub2       completion:sub2:sub3
 mdb> procedures completion:sub1
 procedures completion:sub1
-Registering debuggable procedures... done.
-There are NNN debuggable modules, with a total of NNN procedures.
 List of procedures in module `completion:sub1'
 
 pred completion:sub1:zp/1-0 (det)
Index: completion.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/completion.inp,v
retrieving revision 1.2
diff -u -u -r1.2 completion.inp
--- completion.inp	8 Mar 2002 06:59:32 -0000	1.2
+++ completion.inp	8 Mar 2002 07:13:19 -0000
@@ -1,4 +1,5 @@
 echo on
+register --quiet
 @h at e@v at a@
 p --f@@H@
 sta@ @
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------