for review: misc changes to tests
Zoltan Somogyi
zs at cs.mu.OZ.AU
Wed Apr 15 17:53:30 AEST 1998
Fergus, please look at these three groups of changes, which will be
committed separately.
tests/runtests:
tests/*/runtests:
When reporting the results, print the options that controlled
the tests, so you don't have to search for them.
tests/*/runtests:
Clean up the directory if the tests are successful, in order
to reduce disk space usage.
----------------
tests/debugger/Mmakefile:
Include EXTRA_MCFLAGS in MCFLAGS, instead of just overriding
MCFLAGS totally.
----------------
tests/debugger/interpreter.exp:
Update the expected output of the usage message after Fergus's
changes last week.
Zoltan.
cvs diff: Diffing .
Index: runtests
===================================================================
RCS file: /home/mercury1/repository/tests/runtests,v
retrieving revision 1.3
diff -u -u -r1.3 runtests
--- runtests 1996/12/14 16:56:03 1.3
+++ runtests 1998/04/15 07:26:04
@@ -24,8 +24,10 @@
if test "$failures" = ""
then
echo "all tests have succeeded"
+ echo "gradeopt=$gflag, flagsopt=$fflag, cflagsopt=$cflag"
exit 0
else
echo "some tests have failed in: $failures"
+ echo "gradeopt=$gflag, flagsopt=$fflag, cflagsopt=$cflag"
exit 1
fi
cvs diff: Diffing benchmarks
Index: benchmarks/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/benchmarks/runtests,v
retrieving revision 1.4
diff -u -u -r1.4 runtests
--- runtests 1997/07/14 03:18:36 1.4
+++ runtests 1998/04/15 06:55:21
@@ -23,10 +23,13 @@
if test ! -s .allres -a "$checkstatus" = 0
then
echo "the tests in the benchmark directory succeeded"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
+ mmake $jfactor clean > /dev/null 2>&1
rm -f .allres
exit 0
else
echo "the tests in the benchmark directory failed"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
echo "the differences are:"
cat .allres
exit 1
cvs diff: Diffing debugger
Index: debugger/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.1
diff -u -u -r1.1 Mmakefile
--- Mmakefile 1998/04/08 11:34:56 1.1
+++ Mmakefile 1998/04/15 05:32:14
@@ -11,7 +11,7 @@
interpreter \
queens
-MCFLAGS = --generate-trace
+MCFLAGS = --generate-trace $(EXTRA_MCFLAGS)
# Not all grades can be used with stack layouts
#
Index: debugger/interpreter.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/interpreter.exp,v
retrieving revision 1.1
diff -u -u -r1.1 interpreter.exp
--- interpreter.exp 1998/04/08 11:35:09 1.1
+++ interpreter.exp 1998/04/15 07:02:01
@@ -1,7 +1,8 @@
1: 1 1 CALL DET interpreter:main/2-0
mtrace> valid commands are:
a, EOF: abort the current execution.
-b module pred: set breakpoint in module:pred.
+b <module> <name>: set a breakpoint on the predicate
+ or function <module>:<name>.
c: continue to end of program, not printing the trace.
C: continue to end of program, printing the trace.
f: finish this call, not printing the trace.
@@ -10,11 +11,11 @@
<N> G: go to event #N, printing the trace.
p: print the variables live at this point.
r: continue until forward execution is resumed.
-[<N>] s, [N] CR: skip N events, not printing the trace.
-[<N>] S: skip N events, printing the trace.
+[<N>] [s]: skip N events, not printing the trace (default: N=1).
+[<N>] S: skip N events, printing the trace (default: N=1).
?: list all the breakpoints.
-+ N: enable breakpoint #N.
-- N: disable breakpoint #N.
++ <N>: enable breakpoint #N.
+- <N>: disable breakpoint #N.
mtrace> Pure Prolog Interpreter.
Consulting file `interpreter.m'...
Index: debugger/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/runtests,v
retrieving revision 1.1
diff -u -u -r1.1 runtests
--- runtests 1998/04/08 11:35:28 1.1
+++ runtests 1998/04/15 06:55:39
@@ -14,10 +14,13 @@
if test ! -s .allres -a "$checkstatus" = 0
then
echo "the tests in the debugger directory succeeded"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
+ mmake $jfactor clean > /dev/null 2>&1
rm -f .allres
exit 0
else
echo "the tests in the debugger directory failed"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
echo "the differences are:"
cat .allres
exit 1
cvs diff: Diffing general
Index: general/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/general/runtests,v
retrieving revision 1.4
diff -u -u -r1.4 runtests
--- runtests 1997/07/14 03:18:42 1.4
+++ runtests 1998/04/15 06:55:56
@@ -23,10 +23,13 @@
if test ! -s .allres -a "$checkstatus" = 0
then
echo "the tests in the general directory succeeded"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
+ mmake $jfactor clean > /dev/null 2>&1
rm -f .allres
exit 0
else
echo "the tests in the general directory failed"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
echo "the differences are:"
cat .allres
exit 1
cvs diff: Diffing hard_coded
Index: hard_coded/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/runtests,v
retrieving revision 1.4
diff -u -u -r1.4 runtests
--- runtests 1997/07/14 03:18:43 1.4
+++ runtests 1998/04/15 06:56:16
@@ -14,10 +14,13 @@
if test ! -s .allres -a "$checkstatus" = 0
then
echo "the tests in the hard_coded directory succeeded"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
+ mmake $jfactor clean > /dev/null 2>&1
rm -f .allres
exit 0
else
echo "the tests in the hard_coded directory failed"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
echo "the differences are:"
cat .allres
exit 1
cvs diff: Diffing hard_coded/typeclasses
cvs diff: Diffing invalid
Index: invalid/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/runtests,v
retrieving revision 1.4
diff -u -u -r1.4 runtests
--- runtests 1998/03/20 04:25:09 1.4
+++ runtests 1998/04/15 06:56:31
@@ -13,10 +13,13 @@
if test ! -s .allres -a "$checkstatus" = 0
then
echo "the tests in the invalid directory succeeded"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
+ mmake $jfactor realclean > /dev/null 2>&1
rm -f .allres
exit 0
else
echo "the tests in the invalid directory failed"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
echo "the differences are:"
cat .allres
exit 1
cvs diff: Diffing misc_tests
Index: misc_tests/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/misc_tests/runtests,v
retrieving revision 1.3
diff -u -u -r1.3 runtests
--- runtests 1997/07/14 03:18:45 1.3
+++ runtests 1998/04/15 06:56:48
@@ -14,10 +14,13 @@
if test ! -s .allres -a "$checkstatus" = 0
then
echo "the tests in the misc_tests directory succeeded"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
+ mmake $jfactor clean > /dev/null 2>&1
rm -f .allres
exit 0
else
echo "the tests in the misc_tests directory failed"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
echo "the differences are:"
cat .allres
exit 1
cvs diff: Diffing term
Index: term/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/term/runtests,v
retrieving revision 1.3
diff -u -u -r1.3 runtests
--- runtests 1998/03/20 04:25:15 1.3
+++ runtests 1998/04/15 06:57:12
@@ -14,10 +14,13 @@
if test ! -s .allres -a "$checkstatus" = 0
then
echo "the tests in the term directory succeeded"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
+ mmake $jfactor clean > /dev/null 2>&1
rm -f .allres
exit 0
else
echo "the tests in the term directory failed"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
echo "the differences are:"
cat .allres
exit 1
cvs diff: Diffing valid
Index: valid/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/valid/runtests,v
retrieving revision 1.5
diff -u -u -r1.5 runtests
--- runtests 1998/03/30 13:25:05 1.5
+++ runtests 1998/04/15 06:58:25
@@ -22,8 +22,11 @@
if test "$failed" = "" -a "$checkstatus" = 0
then
echo "the tests in the valid directory succeeded"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
+ mmake $gradeopt $jfactor realclean > /dev/null 2>&1
exit 0
else
echo "some tests in the valid directory failed: $failed"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
exit 1
fi
cvs diff: Diffing warnings
Index: warnings/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/warnings/runtests,v
retrieving revision 1.5
diff -u -u -r1.5 runtests
--- runtests 1997/07/14 03:18:46 1.5
+++ runtests 1998/04/15 06:58:47
@@ -13,10 +13,13 @@
if test ! -s .allres -a "$checkstatus" = 0
then
echo "the tests in the warnings directory succeeded"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
+ mmake $jfactor clean > /dev/null 2>&1
rm -f .allres
exit 0
else
echo "the tests in the warnings directory failed"
+ echo "gradeopt=$gradeopt, flagsopt=$flagsopt, cflagsopt=$cflagsopt"
echo "the differences are:"
cat .allres
exit 1
More information about the developers
mailing list