[m-rev.] diff: fix the failures of mdbrc_test and big_array_from_list

[Zoltan Somogyi]

tests/debugger/mdbrc_test.{inp,exp}:
	Fix the failure of this test case in grades in which the standard
	Mercury library generates events. In those grades, the initial "step"
	command stepped not to the first predicate called in main, but
	to the library function that generated its arguments.

tests/hard_coded/Mmakefile:
	Do not enable the big_array_from_list test case if the grade disables
	tail recursion, since in those grades we *expect* to run out of stack
	when processing its big input.

Zoltan.

cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/libatomic_ops-1.2
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/doc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/hpc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ibmc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/icc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/msftc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/sunc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/tests
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing boehm_gc/windows-untested
cvs diff: Diffing boehm_gc/windows-untested/vc60
cvs diff: Diffing boehm_gc/windows-untested/vc70
cvs diff: Diffing boehm_gc/windows-untested/vc71
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing debian/patches
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/base64
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/fixed
cvs diff: Diffing extras/gator
cvs diff: Diffing extras/gator/generations
cvs diff: Diffing extras/gator/generations/1
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/easyx
cvs diff: Diffing extras/graphics/easyx/samples
cvs diff: Diffing extras/graphics/mercury_allegro
cvs diff: Diffing extras/graphics/mercury_allegro/examples
cvs diff: Diffing extras/graphics/mercury_allegro/samples
cvs diff: Diffing extras/graphics/mercury_allegro/samples/demo
cvs diff: Diffing extras/graphics/mercury_allegro/samples/mandel
cvs diff: Diffing extras/graphics/mercury_allegro/samples/pendulum2
cvs diff: Diffing extras/graphics/mercury_allegro/samples/speed
cvs diff: Diffing extras/graphics/mercury_glut
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/gears
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/log4m
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/moose/tests
cvs diff: Diffing extras/mopenssl
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/net
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/posix/samples
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/solver_types
cvs diff: Diffing extras/solver_types/library
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/windows_installer_generator
cvs diff: Diffing extras/windows_installer_generator/sample
cvs diff: Diffing extras/windows_installer_generator/sample/images
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing extras/xml_stylesheets
cvs diff: Diffing java
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing mdbcomp
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/standalone_c
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/solver_types
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing slice
cvs diff: Diffing ssdb
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
Index: tests/debugger/mdbrc_test.exp
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/mdbrc_test.exp,v
retrieving revision 1.1
diff -u -b -r1.1 mdbrc_test.exp
--- tests/debugger/mdbrc_test.exp	20 Feb 2008 02:59:37 -0000	1.1
+++ tests/debugger/mdbrc_test.exp	31 May 2008 00:25:54 -0000
@@ -1,10 +1,15 @@
       E1:     C1 CALL pred mdbrc_test.main/2-0 (det) mdbrc_test.m:15
 mdb> echo on
 Command echo enabled.
+mdb> register --quiet
 mdb> context none
 Contexts will not be printed.
-mdb> step
+mdb> break p
+ 0: + stop  interface pred mdbrc_test.p/2-0 (det)
+mdb> continue
       E2:     C2 CALL pred mdbrc_test.p/2-0 (det)
+mdb> delete *
+ 0: E stop  interface pred mdbrc_test.p/2-0 (det)
 mdb> finish
       E3:     C2 EXIT pred mdbrc_test.p/2-0 (det)
 mdb> print B
Index: tests/debugger/mdbrc_test.inp
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/mdbrc_test.inp,v
retrieving revision 1.1
diff -u -b -r1.1 mdbrc_test.inp
--- tests/debugger/mdbrc_test.inp	20 Feb 2008 02:59:37 -0000	1.1
+++ tests/debugger/mdbrc_test.inp	31 May 2008 00:24:34 -0000
@@ -1,6 +1,9 @@
 echo on
+register --quiet
 context none
-step
+break p
+continue
+delete *
 finish
 print B
 continue
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
Index: tests/hard_coded/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/hard_coded/Mmakefile,v
retrieving revision 1.352
diff -u -b -r1.352 Mmakefile
--- tests/hard_coded/Mmakefile	22 May 2008 04:11:30 -0000	1.352
+++ tests/hard_coded/Mmakefile	30 May 2008 01:48:15 -0000
@@ -12,7 +12,6 @@
 	backquoted_qualified_ops \
 	bag_various \
 	bidirectional \
-	big_array_from_list \
 	boyer \
 	brace \
 	builtin_inst_rename \
@@ -341,18 +340,18 @@
 
 # Trace goal with runtime conditions work properly only in C and Erlang grades.
 ifeq "$(filter il% java%,$(GRADE))" ""
-	TRACE_GOAL_ENV_PROGS= \
+	TRACE_GOAL_ENV_PROGS = \
 		trace_goal_env_1 \
 		trace_goal_env_2 \
 		trace_goal_env_3
 else
-	TRACE_GOAL_ENV_PROGS=
+	TRACE_GOAL_ENV_PROGS =
 endif
 
 # Compile-time garbage collection is currently incompatible with debugging
 # grades.
 ifeq "$(findstring debug,$(GRADE))" ""
-	CTGC_PROGS= \
+	CTGC_PROGS = \
 		bad_indirect_reuse \
 		bad_indirect_reuse2 \
 		bad_indirect_reuse2b \
@@ -361,7 +360,18 @@
 		uncond_reuse \
 		uncond_reuse_bad
 else
-	CTGC_PROGS=
+	CTGC_PROGS =
+endif
+
+# Programs that deal with large amounts of datas need tail recursion. Don't
+# execute them in grades that do not allow tail recursion, since their failures
+# would be spurious.
+
+ifneq "$(filter debug% deep%,$(GRADE))" ""
+	BIG_DATA_PROGS = \
+		big_array_from_list
+else
+	BIG_DATA_PROGS =
 endif
 
 # Tests of the C#, MC++, and IL foreign language interfaces only
@@ -388,7 +398,7 @@
 # Tests of the C foreign language interface only work in C grades.
 # Runtime options are specific to the C backend.
 ifeq "$(filter il% java% erlang%,$(GRADE))" ""
-	C_ONLY_PROGS= \
+	C_ONLY_PROGS = \
 		factt \
 		factt_sort_test \
 		foreign_type_assertion \
@@ -397,7 +407,7 @@
 		pragma_import \
 		runtime_opt
 else
-	C_ONLY_PROGS=
+	C_ONLY_PROGS =
 endif
 
 # constant_prop_2 fails in hl*prof* grades, due to a complicated phase
@@ -585,9 +595,9 @@
 # string_hash tests features of the Mercury C runtime.
 # It requires too much memory to be used in non-GC grades.
 ifeq "$(filter il% java%,$(GRADE))$(findstring gc,$(GRADE))" "gc"
-	C_AND_GC_ONLY_PROGS=string_hash
+	C_AND_GC_ONLY_PROGS =string_hash
 else
-	C_AND_GC_ONLY_PROGS=
+	C_AND_GC_ONLY_PROGS =
 endif
 
 # Static linking doesn't work on Solaris in debug grades
@@ -619,14 +629,14 @@
 		$(CHAR_REP_PROGS) $(C_ONLY_PROGS) \
 		$(DOTNET_PROGS) $(JAVA_PROGS) $(SOLVER_PROGS) \
 		$(TRAILED_PROGS) $(MUTABLE_PROGS) $(TRACE_GOAL_ENV_PROGS) \
-		$(CTGC_PROGS)
+		$(CTGC_PROGS) $(BIG_DATA_PROGS)
 endif
 
 #-----------------------------------------------------------------------------#
 
 TESTS = $(PROGS)
 SUBDIRS = typeclasses sub-modules exceptions purity
-TESTS_DIR=..
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/par_conj
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/trailing
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------