[m-rev.] diff: fix failure tests/debugger/uci in .decldebug grades

[Julien Fischer]

Estimated hours taken: 0.2
Branches: main

Fix the failure of debugger/uci in .decldebug grades.

tests/debugger/Mmakefile:
tests/debugger/uci.exp:
 	Use standardized event numbering for this test case to avoid
 	differences between shallow and deep tracing.

Julien.

Index: Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.134
diff -u -r1.134 Mmakefile
--- Mmakefile	30 May 2007 07:31:22 -0000	1.134
+++ Mmakefile	31 May 2007 01:54:28 -0000
@@ -543,7 +543,7 @@
  		> type_desc_test.out 2>&1

  uci.out: uci uci.inp
-	$(MDB) ./uci < uci.inp > uci.out 2>&1
+	$(MDB_STD) ./uci < uci.inp > uci.out 2>&1

  uci_index.out: uci_index uci_index.inp
  	$(MDB_STD) ./uci_index < uci_index.inp > uci_index.out 2>&1
Index: uci.exp
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/uci.exp,v
retrieving revision 1.4
diff -u -r1.4 uci.exp
--- uci.exp	24 Apr 2007 06:23:54 -0000	1.4
+++ uci.exp	31 May 2007 01:56:08 -0000
@@ -1,4 +1,4 @@
-       1:      1  1 CALL pred uci.main/2-0 (det) uci.m:17
+      E1:     C1 CALL pred uci.main/2-0 (det) uci.m:17
  mdb> echo on
  Command echo enabled.
  mdb> context none
@@ -19,75 +19,75 @@
  10: + stop  interface __Compare__ for uci.t0/0-0 (det)
  11: + stop  interface __Compare__ for uci.i/3-0 (det)
  mdb> c
-      16:      8  3 CALL __Compare__ for uci.t1/1-0 (det)
+      E2:     C2 CALL __Compare__ for uci.t1/1-0 (det)
  mdb> print goal
  __Compare__(_, b1(11), a1(1))
  mdb> c
-      17:      8  3 EXIT __Compare__ for uci.t1/1-0 (det)
+      E3:     C2 EXIT __Compare__ for uci.t1/1-0 (det)
  mdb> print goal
  __Compare__('>', b1(11), a1(1))
  mdb> c
-      26:     12  3 CALL __Compare__ for uci.t2/2-0 (det)
+      E4:     C3 CALL __Compare__ for uci.t2/2-0 (det)
  mdb> print goal
  __Compare__(_, a2(1, 2), a2(1, 2))
  mdb> c
-      27:     12  3 EXIT __Compare__ for uci.t2/2-0 (det)
+      E5:     C3 EXIT __Compare__ for uci.t2/2-0 (det)
  mdb> print goal
  __Compare__('=', a2(1, 2), a2(1, 2))
  mdb> c
-      36:     16  3 CALL __Compare__ for uci.t3/3-0 (det)
+      E6:     C4 CALL __Compare__ for uci.t3/3-0 (det)
  mdb> print goal
  __Compare__(_, b3(11, 12, 13), a3(1, 2, 3))
  mdb> c
-      37:     16  3 EXIT __Compare__ for uci.t3/3-0 (det)
+      E7:     C4 EXIT __Compare__ for uci.t3/3-0 (det)
  mdb> print goal
  __Compare__('>', b3(11, 12, 13), a3(1, 2, 3))
  mdb> c
-      46:     20  3 CALL __Compare__ for uci.t4/4-0 (det)
+      E8:     C5 CALL __Compare__ for uci.t4/4-0 (det)
  mdb> print goal
  __Compare__(_, a4(1, 2, 3, 4), b4(11, 12, 13, 14))
  mdb> c
-      47:     20  3 EXIT __Compare__ for uci.t4/4-0 (det)
+      E9:     C5 EXIT __Compare__ for uci.t4/4-0 (det)
  mdb> print goal
  __Compare__('<', a4(1, 2, 3, 4), b4(11, 12, 13, 14))
  mdb> c
-      64:     27  3 CALL __Unify__ for uci.t1/1-0 (semidet)
+     E10:     C6 CALL __Unify__ for uci.t1/1-0 (semidet)
  mdb> print goal
  __Unify__(a1(1), a1(1))
  mdb> c
-      65:     27  3 EXIT __Unify__ for uci.t1/1-0 (semidet)
+     E11:     C6 EXIT __Unify__ for uci.t1/1-0 (semidet)
  mdb> print goal
  __Unify__(a1(1), a1(1))
  mdb> c
-      74:     31  3 CALL __Unify__ for uci.t2/2-0 (semidet)
+     E12:     C7 CALL __Unify__ for uci.t2/2-0 (semidet)
  mdb> print goal
  __Unify__(a2(1, 2), b2(11, 12))
  mdb> c
-      75:     31  3 FAIL __Unify__ for uci.t2/2-0 (semidet)
+     E13:     C7 FAIL __Unify__ for uci.t2/2-0 (semidet)
  mdb> print goal
  __Unify__(a2(1, 2), b2(11, 12))
  mdb> c
-      84:     35  3 CALL __Unify__ for uci.t3/3-0 (semidet)
+     E14:     C8 CALL __Unify__ for uci.t3/3-0 (semidet)
  mdb> print goal
  __Unify__(b3(11, 12, 13), b3(11, 12, 13))
  mdb> c
-      85:     35  3 EXIT __Unify__ for uci.t3/3-0 (semidet)
+     E15:     C8 EXIT __Unify__ for uci.t3/3-0 (semidet)
  mdb> print goal
  __Unify__(b3(11, 12, 13), b3(11, 12, 13))
  mdb> c
-      94:     39  3 CALL __Unify__ for uci.t4/4-0 (semidet)
+     E16:     C9 CALL __Unify__ for uci.t4/4-0 (semidet)
  mdb> print goal
  __Unify__(a4(1, 2, 3, 4), b4(11, 12, 13, 14))
  mdb> c
-      95:     39  3 FAIL __Unify__ for uci.t4/4-0 (semidet)
+     E17:     C9 FAIL __Unify__ for uci.t4/4-0 (semidet)
  mdb> print goal
  __Unify__(a4(1, 2, 3, 4), b4(11, 12, 13, 14))
  mdb> c
-     104:     43  3 CALL __Compare__ for uci.i/3-0 (det)
+     E18:    C10 CALL __Compare__ for uci.i/3-0 (det)
  mdb> print goal
  __Compare__(_, ai(1), bi(11))
  mdb> c
-     105:     43  3 EXIT __Compare__ for uci.i/3-0 (det)
+     E19:    C10 EXIT __Compare__ for uci.i/3-0 (det)
  mdb> print goal
  __Compare__('<', ai(1), bi(11))
  mdb> c

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------