[m-rev.] trivial diff: fix clpr test failure

[Fergus Henderson]

Estimated hours taken: 1
Branches: main

Fix a failure of the CLP(R) tests in debug grades.

extras/clpr/samples/tests.exp2:
	New.  This contains the expected output for debug grades.

	The output for the CLP(R) tests is different for debug grades
	because we create extra choice points for debug grades
	(the extra choice points are needed so that the mdb "retry"
	command will work).  This causes different output because
	when a goal flounders (i.e. you try to commit across a choice
	point before you have resolved all of the variables in that
	choice point), you get a message for every choice point that
	you commit across.

extras/clpr/samples/Mmakefile:
	Handle `.exp2' files.
	Also, use $(DIFF_OPTS) rather than hard-coding `-c'.

Workspace: /home/ceres/fjh/mercury
Index: extras/clpr/samples/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/clpr/samples/Mmakefile,v
retrieving revision 1.15
diff -u -d -r1.15 Mmakefile
--- extras/clpr/samples/Mmakefile	14 Mar 2002 05:06:53 -0000	1.15
+++ extras/clpr/samples/Mmakefile	27 Oct 2002 13:03:33 -0000
@@ -45,8 +45,11 @@
 %.out: %
 	./$< > $@ 2>&1
 
-%.res: %.out %.exp
-	diff -c $*.out $*.exp > $@
+DIFF_OPTS=-c
+
+%.res: %.out %.exp 
+	diff $(DIFF_OPTS) $*.out $*.exp > $@ || \
+		diff $(DIFF_OPTS) $*.out $*.exp2 > $@
 
 #-----------------------------------------------------------------------------#
 
Index: extras/clpr/samples/tests.exp2
===================================================================
RCS file: extras/clpr/samples/tests.exp2
diff -N extras/clpr/samples/tests.exp2
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ extras/clpr/samples/tests.exp2	20 Oct 2002 06:15:21 -0000
@@ -0,0 +1,22 @@
+test_delaying_1: no
+test_delaying_2: yes
+X = _v6
+Y = _v5
+test_delaying_1: no
+test_delaying_2: yes
+test_delaying_3: yes: X = _v12, Y = _v11
+test_delaying_4: 
+cfloat.m: warning: goal floundered.
+	This solver can only solve linear constraints.
+	The following delayed goals
+		X15 = cos(X13)
+	were assumed to be solvable.
+
+cfloat.m: warning: goal floundered.
+	This solver can only solve linear constraints.
+	The following delayed goals
+		X15 = cos(X13)
+		X14 = sin(X13)
+	were assumed to be solvable.
+yes: X = _v13
+Done.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------