[m-rev.] diff: update decldebug tests
Ian MacLarty
maclarty at cs.mu.OZ.AU
Mon Oct 10 21:10:40 AEST 2005
Estimated hours taken: 0.4
Branches: main
tests/debugger/declarative/Mmakefile:
tests/debugger/declarative/ho5.exp:
tests/debugger/declarative/ho5.exp2:
tests/debugger/declarative/throw.exp:
tests/debugger/declarative/throw.exp2:
Use standardised mdb output for these test cases. The event numbers
had become incorrect in the decldebug grade, presumably because
something in the library was changed.
Index: tests/debugger/declarative/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/Mmakefile,v
retrieving revision 1.82
diff -u -r1.82 Mmakefile
--- tests/debugger/declarative/Mmakefile 16 Sep 2005 05:42:57 -0000 1.82
+++ tests/debugger/declarative/Mmakefile 10 Oct 2005 07:52:30 -0000
@@ -333,7 +333,7 @@
# We need to pipe the output through sed to avoid hard-coding dependencies on
# particular line numbers in the standard library source code.
ho5.out: ho5 ho5.inp
- $(MDB) ./ho5 < ho5.inp 2>&1 | \
+ $(MDB_STD) ./ho5 < ho5.inp 2>&1 | \
sed -e 's/exception.m:[0-9]*/exception.m:NNNN/g' \
> ho5.out 2>&1 \
|| { grep . $@ /dev/null; exit 1; }
@@ -481,7 +481,7 @@
# We need to pipe the output through sed to avoid hard-coding dependencies on
# particular line numbers in the standard library source code.
throw.out: throw throw.inp
- $(MDB) ./throw < throw.inp 2>&1 | \
+ $(MDB_STD) ./throw < throw.inp 2>&1 | \
sed -e 's/exception.m:[0-9]*/exception.m:NNNN/g' | \
sed -e '/EXCP/s/).*/)/' > throw.out 2>&1 \
|| { grep . $@ /dev/null; exit 1; }
Index: tests/debugger/declarative/ho5.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho5.exp,v
retrieving revision 1.5
diff -u -r1.5 ho5.exp
--- tests/debugger/declarative/ho5.exp 20 May 2005 05:40:25 -0000 1.5
+++ tests/debugger/declarative/ho5.exp 10 Oct 2005 11:04:34 -0000
@@ -1,13 +1,13 @@
- 1: 1 1 CALL pred ho5.main/2-0 (cc_multi) ho5.m:8
+ E1: C1 CALL pred ho5.main/2-0 (cc_multi) ho5.m:8
mdb> echo on
Command echo enabled.
mdb> register --quiet
mdb> break p
0: + stop interface pred ho5.p/2-0 (det)
mdb> continue
- 2: 2 2 CALL pred ho5.p/2-0 (det) ho5.m:18
+ E2: C2 CALL pred ho5.p/2-0 (det) ho5.m:18
mdb> finish
- 9: 2 2 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18
+ E3: C2 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18
mdb> dd -d 3 -n 7
Call p(1, _)
Throws zero
@@ -21,15 +21,15 @@
p(1, _)
zero
Is this a bug? yes
- 9: 2 2 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18
+ E3: C2 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18
mdb> continue
mdb: warning: reached unknown label
This may result in some exception events
being omitted from the trace.
exception(univ_cons('<<function>>'))
- 10: 5 2 CALL pred ho5.p/2-0 (det) ho5.m:18
+ E4: C3 CALL pred ho5.p/2-0 (det) ho5.m:18
mdb> finish
- 17: 5 2 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18
+ E5: C3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18
mdb> dd -d 3 -n 7
Call p(2, _)
Throws zero
@@ -40,7 +40,7 @@
p(2, _)
zero
Is this a bug? yes
- 17: 5 2 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18
+ E5: C3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18
mdb> continue
mdb: warning: reached unknown label
This may result in some exception events
Index: tests/debugger/declarative/ho5.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho5.exp2,v
retrieving revision 1.6
diff -u -r1.6 ho5.exp2
--- tests/debugger/declarative/ho5.exp2 20 May 2005 05:40:25 -0000 1.6
+++ tests/debugger/declarative/ho5.exp2 10 Oct 2005 11:04:18 -0000
@@ -1,13 +1,13 @@
- 1: 1 1 CALL pred ho5.main/2-0 (cc_multi) ho5.m:8
+ E1: C1 CALL pred ho5.main/2-0 (cc_multi) ho5.m:8
mdb> echo on
Command echo enabled.
mdb> register --quiet
mdb> break p
0: + stop interface pred ho5.p/2-0 (det)
mdb> continue
- 3: 3 3 CALL pred ho5.p/2-0 (det) ho5.m:18 (exception.m:NNNN)
+ E2: C2 CALL pred ho5.p/2-0 (det) ho5.m:18 (exception.m:NNNN)
mdb> finish
- 12: 3 3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
+ E3: C2 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
mdb> dd -d 3 -n 7
Call p(1, _)
Throws zero
@@ -21,12 +21,12 @@
p(1, _)
zero
Is this a bug? yes
- 12: 3 3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
+ E3: C2 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
mdb> continue
exception(univ_cons('<<function>>'))
- 19: 10 3 CALL pred ho5.p/2-0 (det) ho5.m:18 (exception.m:NNNN)
+ E4: C3 CALL pred ho5.p/2-0 (det) ho5.m:18 (exception.m:NNNN)
mdb> finish
- 28: 10 3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
+ E5: C3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
mdb> dd -d 3 -n 7
Call p(2, _)
Throws zero
@@ -37,6 +37,6 @@
p(2, _)
zero
Is this a bug? yes
- 28: 10 3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
+ E5: C3 EXCP pred ho5.p/2-0 (det) c2; ho5.m:18 (exception.m:NNNN)
mdb> continue
exception(univ_cons('<<function>>'))
Index: tests/debugger/declarative/throw.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/throw.exp,v
retrieving revision 1.8
diff -u -r1.8 throw.exp
--- tests/debugger/declarative/throw.exp 20 May 2005 05:40:30 -0000 1.8
+++ tests/debugger/declarative/throw.exp 10 Oct 2005 11:05:31 -0000
@@ -1,4 +1,4 @@
- 1: 1 1 CALL pred throw.main/2-0 (cc_multi) throw.m:10
+ E1: C1 CALL pred throw.main/2-0 (cc_multi) throw.m:10
mdb> echo on
Command echo enabled.
mdb> register --quiet
@@ -7,9 +7,9 @@
mdb> break q
1: + stop interface pred throw.q/1-0 (semidet)
mdb> continue
- 2: 2 2 CALL pred throw.p/1-0 (cc_nondet) throw.m:20
+ E2: C2 CALL pred throw.p/1-0 (cc_nondet) throw.m:20
mdb> finish
- 31: 2 2 EXCP pred throw.p/1-0 (cc_nondet)
+ E3: C2 EXCP pred throw.p/1-0 (cc_nondet) q!;c2; throw.m:22
mdb> dd -d 3 -n 7
Call p(_)
Throws "Too big"
@@ -23,15 +23,15 @@
p(_)
"Too big"
Is this a bug? yes
- 31: 2 2 EXCP pred throw.p/1-0 (cc_nondet)
+ E3: C2 EXCP pred throw.p/1-0 (cc_nondet) q!;c2; throw.m:22
mdb> continue
mdb: warning: reached unknown label
This may result in some exception events
being omitted from the trace.
exception(univ_cons("Too big"))
- 32: 6 2 CALL pred throw.q/1-0 (semidet) throw.m:48
+ E4: C3 CALL pred throw.q/1-0 (semidet) throw.m:48
mdb> finish
- 65: 6 2 EXCP pred throw.q/1-0 (semidet)
+ E5: C3 EXCP pred throw.q/1-0 (semidet) c2;~;q!;c2;~;q!;c2; throw.m:52
mdb> dd -d 3 -n 7
Call q(_)
Throws "Too big"
@@ -45,7 +45,7 @@
q(_)
"Too big"
Is this a bug? yes
- 65: 6 2 EXCP pred throw.q/1-0 (semidet)
+ E5: C3 EXCP pred throw.q/1-0 (semidet) c2;~;q!;c2;~;q!;c2; throw.m:52
mdb> continue
mdb: warning: reached unknown label
This may result in some exception events
Index: tests/debugger/declarative/throw.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/throw.exp2,v
retrieving revision 1.11
diff -u -r1.11 throw.exp2
--- tests/debugger/declarative/throw.exp2 20 May 2005 05:40:30 -0000 1.11
+++ tests/debugger/declarative/throw.exp2 10 Oct 2005 11:05:11 -0000
@@ -1,4 +1,4 @@
- 1: 1 1 CALL pred throw.main/2-0 (cc_multi) throw.m:10
+ E1: C1 CALL pred throw.main/2-0 (cc_multi) throw.m:10
mdb> echo on
Command echo enabled.
mdb> register --quiet
@@ -7,9 +7,9 @@
mdb> break q
1: + stop interface pred throw.q/1-0 (semidet)
mdb> continue
- 3: 3 3 CALL pred throw.p/1-0 (cc_nondet) throw.m:20 (exception.m:NNNN)
+ E2: C2 CALL pred throw.p/1-0 (cc_nondet) throw.m:20 (exception.m:NNNN)
mdb> finish
- 56: 3 3 EXCP pred throw.p/1-0 (cc_nondet)
+ E3: C2 EXCP pred throw.p/1-0 (cc_nondet)
mdb> dd -d 3 -n 7
Call p(_)
Throws "Too big"
@@ -23,12 +23,12 @@
p(_)
"Too big"
Is this a bug? yes
- 56: 3 3 EXCP pred throw.p/1-0 (cc_nondet)
+ E3: C2 EXCP pred throw.p/1-0 (cc_nondet)
mdb> continue
exception(univ_cons("Too big"))
- 63: 22 3 CALL pred throw.q/1-0 (semidet) throw.m:48 (exception.m:NNNN)
+ E4: C3 CALL pred throw.q/1-0 (semidet) throw.m:48 (exception.m:NNNN)
mdb> finish
- 116: 22 3 EXCP pred throw.q/1-0 (semidet)
+ E5: C3 EXCP pred throw.q/1-0 (semidet)
mdb> dd -d 3 -n 7
Call q(_)
Throws "Too big"
@@ -42,6 +42,6 @@
q(_)
"Too big"
Is this a bug? yes
- 116: 22 3 EXCP pred throw.q/1-0 (semidet)
+ E5: C3 EXCP pred throw.q/1-0 (semidet)
mdb> continue
exception(univ_cons("Too big"))
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------
More information about the reviews
mailing list