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

[Simon Taylor]

Estimated hours taken: 0.25

tests/debugger/Mmakefile:
tests/debugger/completion.inp:
tests/debugger/completion.exp:
tests/debugger/completion.exp2:
	Fix dependencies on the contents of the standard library.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.67
diff -u -u -r1.67 Mmakefile
--- Mmakefile	6 Mar 2002 14:35:01 -0000	1.67
+++ Mmakefile	8 Mar 2002 06:41:45 -0000
@@ -136,8 +136,9 @@
 
 # Set up readline to make it easier to use completion non-interactively.
 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
 
 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.2
diff -u -u -r1.2 completion.exp
--- completion.exp	7 Mar 2002 06:06:04 -0000	1.2
+++ completion.exp	8 Mar 2002 06:44:00 -0000
@@ -47,7 +47,7 @@
 completion:sub1       completion:sub2       completion:sub2:sub3
 procedures completion:sub1
 Registering debuggable procedures... done.
-There are 4 debuggable modules, with a total of 7 procedures.
+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)
@@ -55,16 +55,15 @@
 mdb> set --flat format pretty 
 mdb> unalias excp 
 Alias `excp' removed.
-mdb> 
-z      z1     z2     zabc3  zp     zz     
-b zabc3 
+mdb> b zabc3 
  0: + stop  interface func completion:sub2:sub3:zabc3/0-0 (det)
 mdb> 
-pred*completion:            pred*completion:sub2:sub3:
-pred*completion:sub1:       pred*main
-pred*completion:sub2:       pred*zp
-b pred*zp 
- 1: + stop  interface pred completion:sub1:zp/1-0 (det)
+func*completion:            func*completion:sub2:
+func*completion:sub1:       func*completion:sub2:sub3:
+
+func*completion:z   func*completion:zz  
+b func*completion:z
+ 1: + stop  interface func completion:z/0-0 (det)
 mdb> 
 completion:            completion:sub2:       
 completion:sub1:       completion:sub2:sub3:  
Index: completion.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/completion.exp2,v
retrieving revision 1.1
diff -u -u -r1.1 completion.exp2
--- completion.exp2	7 Mar 2002 13:52:55 -0000	1.1
+++ completion.exp2	8 Mar 2002 06:57:18 -0000
@@ -44,7 +44,7 @@
    0       1       1    1 pred completion:main/2-0 (det) (completion.m:13) (empty)
 mdb> proc
 proc_stats  procedures  
-mdb> procedures compl
+mdb> procedures complet
 completion            completion:sub2       
 completion:sub1       completion:sub2:sub3  
 mdb> procedures completion:
@@ -52,7 +52,7 @@
 mdb> procedures completion:sub1
 procedures completion:sub1
 Registering debuggable procedures... done.
-There are 4 debuggable modules, with a total of 7 procedures.
+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)
@@ -62,19 +62,18 @@
 mdb> unalias excp 
 unalias excp 
 Alias `excp' removed.
-mdb> b z
-z      z1     z2     zabc3  zp     zz     
 mdb> b zabc3 
 b zabc3 
  0: + stop  interface func completion:sub2:sub3:zabc3/0-0 (det)
-mdb> b pred*
-pred*completion:            pred*completion:sub2:sub3:
-pred*completion:sub1:       pred*main
-pred*completion:sub2:       pred*zp
-mdb> b pred*zp 
-b pred*zp 
- 1: + stop  interface pred completion:sub1:zp/1-0 (det)
-mdb> b compl
+mdb> b func*complet
+func*completion:            func*completion:sub2:
+func*completion:sub1:       func*completion:sub2:sub3:
+mdb> b func*completion:z
+func*completion:z   func*completion:zz  
+mdb> b func*completion:z
+b func*completion:z
+ 1: + stop  interface func completion:z/0-0 (det)
+mdb> b complet
 completion:            completion:sub2:       
 completion:sub1:       completion:sub2:sub3:  
 mdb> b completion:s
@@ -84,7 +83,7 @@
 mdb> b completion:sub1:z1
 b completion:sub1:z1
  2: + stop  interface func completion:sub1:z1/0-0 (det)
-mdb> b compl
+mdb> b complet
 completion:            completion:sub2:       
 completion:sub1:       completion:sub2:sub3:  
 mdb> b completion:s
Index: completion.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/completion.inp,v
retrieving revision 1.1
diff -u -u -r1.1 completion.inp
--- completion.inp	6 Mar 2002 14:35:02 -0000	1.1
+++ completion.inp	8 Mar 2002 06:43:56 -0000
@@ -2,12 +2,12 @@
 @h at e@v at a@
 p --f@@H@
 sta@ @
-proc at e@compl@:@1
+proc at e@complet@:@1
 set --f at fo@p@
 un at ex@
-b z at a@
-b pred*@z@
-b compl at s@1 at 1
-b compl at s@2 at s@
+b za@
+b func*complet at z@
+b complet at s@1 at 1
+b complet at s@2 at s@
 2d at e@
 c
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------