[m-dev.] for review: nondet code gen bug fix

[Fergus Henderson]

On 02-Jun-1998, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> Fix some bugs in code generation for nondet disjunctions and
> if-then-elses.
...
> tests/hard_coded/Mmakefile:
> tests/hard_coded/trail_test.m:
> tests/hard_coded/trail_test.exp:
> tests/hard_coded/trail_test_2.m:
> tests/hard_coded/trail_test_2.exp:
> 	Add a couple of regression tests.

It turned out that adding the tests there didn't quite work.
So I've moved them to extras/trailed_update/tests.
Apart from that, the change is as before.
It passed the bootstrap check, so I'll commit it.

extras/trailed_update/Mmakefile:
extras/trailed_update/samples/Mmakefile:
extras/trailed_update/samples/tests.m:
extras/trailed_update/samples/tests.exp:
extras/trailed_update/tests/Mmakefile:
extras/trailed_update/tests/var_test.m:
extras/trailed_update/tests/var_test.exp:
	Add a new subdirectory `tests' in extras/trailed_update,
	and move the test case `tests.{m,exp}' from the samples
	subdirectory into the tests subdirectory, at the same
	time renaming it as `var_test.{m,exp}'.

extras/trailed_update/tests/Mmakefile:
extras/trailed_update/tests/func_trail_test.m:
extras/trailed_update/tests/func_trail_test.exp:
extras/trailed_update/tests/func_trail_test_2.m:
extras/trailed_update/tests/func_trail_test_2.exp:
	Add a couple of regression tests for the bug mentioned above.
	These tests need to go here rather than somewhere in the
	main `tests' directory (e.g. `tests/hard_coded'), because
	they only work in trailing grades, and the normal tests are
	compiled in lots of grades, many of which don't have
	corresponding trailing grades installed.
	(I suppose we could put them in the main `tests' directory,
	and only enable them for trailing grades, but it just seemed
	easier to put them here.)

Index: extras/trailed_update/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/Mmakefile,v
retrieving revision 1.6
diff -u -r1.6 Mmakefile
--- Mmakefile	1998/02/11 09:10:28	1.6
+++ Mmakefile	1998/06/02 03:50:54
@@ -15,9 +15,11 @@
 
 depend : trailed_update.depend
 	cd samples && mmake $(MMAKEFLAGS) depend
+	cd tests && mmake $(MMAKEFLAGS) depend
 
 check : libtrailed_update
 	cd samples && mmake $(MMAKEFLAGS) check
+	cd tests && mmake $(MMAKEFLAGS) check
 
 # We need this to use shared libraries on Linux
 ML = ml --mercury-libs shared
Index: extras/trailed_update/samples/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/samples/Mmakefile,v
retrieving revision 1.7
diff -u -r1.7 Mmakefile
--- Mmakefile	1998/03/12 02:48:50	1.7
+++ Mmakefile	1998/06/02 03:51:51
@@ -31,7 +31,7 @@
 
 #-----------------------------------------------------------------------------#
 
-PROGS	=	interpreter vqueens tests
+PROGS	=	interpreter vqueens
 
 DEPENDS =	$(PROGS:%=%.depend)
 CS	=	$(PROGS:%=%.c)
@@ -65,7 +65,7 @@
 # since it fails in grade asm_fast.tr.
 # (It fails due to a bug in value numbering which causes
 # parts of the Mercury library to be miscompiled.)
-check: vqueens.res tests.res
+check: vqueens.res
 # check: $(RESS)
 
 .PHONY: cs
cvs diff: extras/trailed_update/samples/tests.exp was removed, no comparison available
cvs diff: extras/trailed_update/samples/tests.m was removed, no comparison available
cvs diff: I know nothing about extras/trailed_update/tests/Mmakefile
cvs diff: extras/trailed_update/tests/func_trail_test.exp is a new entry, no comparison available
cvs diff: extras/trailed_update/tests/func_trail_test.m is a new entry, no comparison available
cvs diff: extras/trailed_update/tests/func_trail_test_2.exp is a new entry, no comparison available
cvs diff: extras/trailed_update/tests/func_trail_test_2.m is a new entry, no comparison available
cvs diff: extras/trailed_update/tests/var_test.exp is a new entry, no comparison available
cvs diff: extras/trailed_update/tests/var_test.m is a new entry, no comparison available
-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.