[m-dev.] diff: update regression tests outputs in Morphine
Erwan Jahier
Erwan.Jahier at irisa.fr
Tue Dec 21 06:29:42 AEDT 1999
This change completes my previous one.
--
Estimated hours taken: 0.5
This change makes the previous one pass the Morphine regression tests (that I
should have run before committing...).
morphine/non-regression-tests/queens.in:
morphine/non-regression-tests/test_vars.in:
Print a copyright into queens.exp and test_vars.exp to avoid problems
with remote cvs support.
morphine/non-regression-tests/queens.exp:
morphine/non-regression-tests/test_vars.exp:
Update the expected outputs of the regression tests in order to reflect
the previous change (removal of the I/O that were wrapping each new
Mercury program execution).
Index: non-regression-tests/queens.exp
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/morphine/non-regression-tests/queens.exp,v
retrieving revision 1.2
diff -u -r1.2 queens.exp
--- non-regression-tests/queens.exp 1999/12/15 13:40:24 1.2
+++ non-regression-tests/queens.exp 1999/12/20 19:07:33
@@ -1,4 +1,5 @@
[morphine 1]:
+Copyright (C) 1999 INRIA/INSA de Rennes.
**************************************************
******** Non regression test for Morphine *********
**************************************************
@@ -6,10 +7,6 @@
**************************************************
**** Display the first 20 events:
Start debugging queens program.
-
----------------------------------
-[./queens ...]
-
1: 1 [1] call main(state('<<c_pointer>>'), -) []
2: 2 [2] call data(-) []
3: 2 [2] exit data([1, 2, 3, 4, 5]) []
@@ -31,8 +28,6 @@
19: 9 [6] exit nondet (predicate) {queens} queens: qdelete(3 {int}, [3, 4, 5] {list__list(int)}, [4, 5] {list__list(int)})/3-0 []
20: 10 [6] call nondet (predicate) {queens} queens: qperm([4, 5] {list__list(int)}, -)/2-0 []
[1, 3, 5, 2, 4]
-
----------------------------------
End of connection with the traced program
ok.
@@ -43,10 +38,6 @@
**** Testing toggle/1...
run(./, queens, )
Start debugging queens program.
-
----------------------------------
-[./queens ...]
-
1: 1 [1] call main(state('<<c_pointer>>'), -) []
3: 2 [2] exit data([1, 2, 3, 4, 5]) []
toggle chrono attribute:
@@ -96,8 +87,6 @@
3: 2 [2] exit data([1, 2, 3, 4, 5]) []
no (more) solution.
[morphine 3]: [1, 3, 5, 2, 4]
-
----------------------------------
End of connection with the traced program
toggle: ok.
[morphine 4]:
@@ -105,16 +94,10 @@
**** Testing one by one variable retrieval...
run(./, queens, )
Start debugging queens program.
-
----------------------------------
-[./queens ...]
-
1: 1 [1] call main(state('<<c_pointer>>'), -) []
673: 3 [2] exit queen([1, 2, 3, 4, 5], [1, 3, 5, 2, 4]) []
[live_var_names_and_types(HeadVar__1, list:list(int)), live_var_names_and_types(HeadVar__2, list:list(int))]
[1, 2, 3, 4, 5][1, 3, 5, 2, 4]
-
----------------------------------
End of connection with the traced program
one by one variable retrieval: ok.
@@ -126,10 +109,6 @@
**** Testing current...
run(./, queens, )
Start debugging queens program.
-
----------------------------------
-[./queens ...]
-
1: 1 [1] call main(state('<<c_pointer>>'), -) []
673: 3 [2] exit queen([1, 2, 3, 4, 5], [1, 3, 5, 2, 4]) []
current_live_var: [(HeadVar__1, [1, 2, 3, 4, 5], list : list(int)), (HeadVar__2, [1, 3, 5, 2, 4], list : list(int))]
@@ -168,8 +147,6 @@
queen / 2
queen - 0
predicate -> queens : queen / 2 - 0[1, 3, 5, 2, 4]
-
----------------------------------
End of connection with the traced program
current: ok.
@@ -248,16 +225,10 @@
**** Testing retry/1...
run(./, queens, )
Start debugging queens program.
-
----------------------------------
-[./queens ...]
-
1: 1 [1] call main(state('<<c_pointer>>'), -) []
673: 3 [2] exit queen([1, 2, 3, 4, 5], [1, 3, 5, 2, 4]) []
4: 3 [2] call queen([1, 2, 3, 4, 5], -) []
[1, 3, 5, 2, 4]
-
----------------------------------
End of connection with the traced program
retry: ok.
[morphine 7]:
@@ -265,18 +236,12 @@
**** Testing stack dumps...
run(./, queens, )
Start debugging queens program.
-
----------------------------------
-[./queens ...]
-
1: 1 [1] call main(state('<<c_pointer>>'), -) []
3: 2 [2] exit data([1, 2, 3, 4, 5]) []
Level 0: (chrono=2, call=2, depth=2) pred queens:data/1-0 (det)
Level 1: (chrono=1, call=1, depth=1) pred queens:main/2-0 (cc_multi)
[1, 3, 5, 2, 4]
-
----------------------------------
End of connection with the traced program
stack: ok.
@@ -286,10 +251,6 @@
**** Testing the term browser...
run(./, queens, )
Start debugging queens program.
-
----------------------------------
-[./queens ...]
-
1: 1 [1] call main(state('<<c_pointer>>'), -) []
397: 83 [8] exit nodiag(1, 5, []) []
browser> 1
@@ -366,8 +327,6 @@
browser> 1
browser> 1
browser> [1, 3, 5, 2, 4]
-
----------------------------------
End of connection with the traced program
browser: ok.
[morphine 9]:
@@ -375,14 +334,8 @@
**** Testing collect...
run(./, queens, )
Start debugging queens program.
-
----------------------------------
-[./queens ...]
-
1: 1 [1] call main(state('<<c_pointer>>'), -) []
[1, 3, 5, 2, 4]
-
----------------------------------
End of connection with the traced program
[sol(proc(predicate, "queens", "print_list_2", 3, 0), [univ([4] : list : list(int)), univ(state('<<c_pointer>>') : io : state)]), sol(proc(predicate, "queens", "print_list_2", 3, 0), [univ([2, 4] : list : list(int)), univ(state('<<c_pointer>>') : io : state)]), sol(proc(predicate, "queens", "print_list_2", 3, 0), [univ([5, 2, 4] : list : list(int)), univ(state('<<c_pointer>>') : io : state)]), sol(proc(predicate, "queens", "print_list_2", 3, 0), [univ([3, 5, 2, 4] : list : list(int)), univ(state('<<c_pointer>>') : io : state)]), sol(proc(predicate, "queens", "print_list_2", 3, 0), [univ([1, 3, 5, 2, 4] : list : list(int)), univ(state('<<c_pointer>>') : io : state)]), sol(proc(predicate, "queens", "print_list", 3, 0), [univ([1, 3, 5, 2, 4] : list : list(int)), univ(state('<<c_pointer>>') : io : state)]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(4 : int), univ(1 : int), univ([] : list : l!
ist(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(2 : int), univ(2 : int), univ([] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(2 : int), univ(1 : int), univ([4] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([2, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(5 : int), univ(3 : int), univ([] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(5 : int), univ(2 : int), univ([4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(5 : int), univ(1 : int), univ([2, 4] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([5, 2, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(3 : int), univ(4 : int), univ([] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(3 : int), univ(3 : !
int), univ([4] : list : list(int))]), sol(proc(predicate, "queens", "n
odiag", 3, 0), [univ(3 : int), univ(2 : int), univ([2, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(3 : int), univ(1 : int), univ([5, 2, 4] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([3, 5, 2, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(3 : int), univ([2, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(2 : int), univ([5, 2, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([3, 5, 2, 4] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 3, 5, 2, 4] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([2, 4] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([2, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(3 : int), univ(1 : int), univ([4, 5, 2] : list :!
list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([3, 4, 5, 2] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(4 : int), univ([2] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(3 : int), univ([5, 2] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(2 : int), univ([4, 5, 2] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([3, 4, 5, 2] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 3, 4, 5, 2] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([2] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([2] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(4 : int), univ([5] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(!
3 : int), univ([2, 5] : list : list(int))]), sol(proc(predicate, "quee
ns", "nodiag", 3, 0), [univ(1 : int), univ(2 : int), univ([4, 2, 5] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([3, 4, 2, 5] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 3, 4, 2, 5] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([2, 5] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([2, 5] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(3 : int), univ(1 : int), univ([2, 5, 4] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([3, 2, 5, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(5 : int), univ([] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(4 : int), univ([4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(3 : int), univ([5, 4] : list : li!
st(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(2 : int), univ([2, 5, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([3, 2, 5, 4] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 3, 2, 5, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(3 : int), univ([4, 5] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(2 : int), univ([2, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([3, 2, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 3, 2, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([2, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([2, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3!
, 0), [univ(1 : int), univ(1 : int), univ([2, 5, 4, 3] : list : list(i
nt))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 2, 5, 4, 3] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([2, 5, 3, 4] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 2, 5, 3, 4] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([3, 4] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([3, 4] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([2, 4, 5, 3] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 2, 4, 5, 3] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([3] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([3] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([2, 4, 3, 5] : list : list(int))]), sol(proc(predicate, "queens"!
, "safe", 1, 0), [univ([1, 2, 4, 3, 5] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([3, 5] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([3, 5] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([2, 3, 5, 4] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 2, 3, 5, 4] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([4] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([4] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([] : list : list(int))]), sol(proc(predicate, "queens", "nodiag", 3, 0), [univ(1 : int), univ(1 : int), univ([2, 3, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "safe", 1, 0), [univ([1, 2, 3, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([] : list : list(int))]), sol(proc(predicate, "que!
ens", "qdelete", 3, 0), [univ([5] : list : list(int))]), sol(proc(pred
icate, "queens", "qperm", 2, 0), [univ([5] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([3, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([3, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([2, 3, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([2, 3, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qdelete", 3, 0), [univ([1, 2, 3, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "qperm", 2, 0), [univ([1, 2, 3, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "queen", 2, 0), [univ([1, 2, 3, 4, 5] : list : list(int))]), sol(proc(predicate, "queens", "data", 1, 0), []), sol(proc(predicate, "queens", "main", 2, 0), [univ(state('<<c_pointer>>') : io : s!
tate)])]collect: ok.
Index: non-regression-tests/queens.in
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/morphine/non-regression-tests/queens.in,v
retrieving revision 1.2
diff -u -r1.2 queens.in
--- non-regression-tests/queens.in 1999/12/15 13:40:24 1.2
+++ non-regression-tests/queens.in 1999/12/20 19:07:33
@@ -1,3 +1,4 @@
+write("\nCopyright (C) 1999 INRIA/INSA de Rennes."),
write("\n**************************************************\n"),
write("******** Non regression test for Morphine *********\n"),
write("**************************************************\n\n"),
Index: non-regression-tests/test_vars.exp
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/morphine/non-regression-tests/test_vars.exp,v
retrieving revision 1.2
diff -u -r1.2 test_vars.exp
--- non-regression-tests/test_vars.exp 1999/12/15 13:40:24 1.2
+++ non-regression-tests/test_vars.exp 1999/12/20 19:07:34
@@ -1,16 +1,11 @@
[morphine 1]:
+Copyright (C) 1999 INRIA/INSA de Rennes.
**************************************************
**** Testing test_vars.m...
Start debugging test_vars program.
-
----------------------------------
-[./test_vars ...]
-
1: 1 [1] call main(state('<<c_pointer>>'), -) []
3: 2 [2] exit p(3 - 8) []
-[3 - 8]
----------------------------------
-End of connection with the traced program
+[3 - 8]End of connection with the traced program
test_vars: ok.
Arg = [3 - 8]
Index: non-regression-tests/test_vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/morphine/non-regression-tests/test_vars.in,v
retrieving revision 1.1
diff -u -r1.1 test_vars.in
--- non-regression-tests/test_vars.in 1999/11/11 04:52:11 1.1
+++ non-regression-tests/test_vars.in 1999/12/20 19:07:34
@@ -1,3 +1,4 @@
+write("\nCopyright (C) 1999 INRIA/INSA de Rennes."),
write("\n**************************************************"),
write("\n**** Testing test_vars.m...\n"),
run(test_vars),
--
R1.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to: mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions: mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------
More information about the developers
mailing list