[m-rev.] diff: threads_hang failing in nightly tests

[Peter Wang]

Estimated hours taken: 0.5
Branches: main

tests/par_conj/Mmakefile:
tests/par_conj/threads_hang.exp:
tests/par_conj/threads_hang.m:
	Make par_conj/threads_hang calculate smaller fibonacci numbers so as
	not to use as much memory and fail nightly tests.  Compensate by
	running the test more times.

Index: tests/par_conj/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/par_conj/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- tests/par_conj/Mmakefile	29 Jun 2006 03:53:34 -0000	1.2
+++ tests/par_conj/Mmakefile	2 Jul 2006 06:44:42 -0000
@@ -95,7 +95,7 @@
 # Repeat the test a few times in increase the chances of getting a deadlock.
 ifeq "$(filter hl% java% il%,$(GRADE))" ""
 threads_hang.out: threads_hang
-	for i in 1 2 3 4 5 ; do \
+	for i in 1 2 3 4 5 6 7 8 9 10 ; do \
 		MERCURY_OPTIONS=-P10 ./threads_hang 2>&1 > threads_hang.out ;\
 	done
 endif
Index: tests/par_conj/threads_hang.exp
===================================================================
RCS file: /home/mercury1/repository/tests/par_conj/threads_hang.exp,v
retrieving revision 1.1
diff -u -r1.1 threads_hang.exp
--- tests/par_conj/threads_hang.exp	29 Jun 2006 03:53:35 -0000	1.1
+++ tests/par_conj/threads_hang.exp	2 Jul 2006 06:40:27 -0000
@@ -1 +1,2 @@
-144
+21
+13
Index: tests/par_conj/threads_hang.m
===================================================================
RCS file: /home/mercury1/repository/tests/par_conj/threads_hang.m,v
retrieving revision 1.1
diff -u -r1.1 threads_hang.m
--- tests/par_conj/threads_hang.m	29 Jun 2006 03:53:35 -0000	1.1
+++ tests/par_conj/threads_hang.m	2 Jul 2006 06:46:48 -0000
@@ -11,9 +11,13 @@
 :- import_module int.
 
 main(!IO) :-
-    fib(11, F),
+    fib(7, F),
+    fib(6, G),
     io.write_int(F, !IO),
-    io.nl(!IO).
+    io.nl(!IO),
+    io.write_int(G, !IO),
+    io.nl(!IO),
+    io.flush_output(!IO).
 
 :- pred fib(int::in, int::out) is det.
 
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------