[m-rev.] diff: better progress indications during bootcheck

[Zoltan Somogyi]

tests/*/Mmakefile:
	Sort the lists of tests in each directory. (We usually keep each list
	sorted, but then we concatenate several lists, which loses the order.)
	This gives you a better idea of how far a bootcheck still has to go.

tools/bootcheck:
	Build the interface files before the rest of the files in the library
	directory. Again, this gives you a better idea of how far a bootcheck
	still has to go.

	Make the dependencies for the slice subdirectory of the stage2 at the
	same time as the other subdirs; don't let it be caught later.

library/Mmakefile:
	Build the interface files in the right order.

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
Index: library/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.152
diff -u -b -r1.152 Mmakefile
--- library/Mmakefile	3 Oct 2007 12:11:56 -0000	1.152
+++ library/Mmakefile	15 Jul 2008 03:24:48 -0000
@@ -176,20 +176,20 @@
 
 ifeq ($(LIBRARY_INTERMODULE),yes)
 
-all-ints: ints int3s opts trans_opts
+all-ints: int3s ints opts trans_opts
 
 else
 
-all-ints: ints int3s
+all-ints: int3s ints
 
 endif
 
-.PHONY: ints
-ints:	$(STD_LIB_NAME).ints
-
 .PHONY: int3s
 int3s:	$(STD_LIB_NAME).int3s
 
+.PHONY: ints
+ints:	$(STD_LIB_NAME).ints
+
 .PHONY: opts
 opts:	$(STD_LIB_NAME).opts
 
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/analysis
cvs diff: Diffing tests/analysis/ctgc
cvs diff: Diffing tests/analysis/excp
cvs diff: Diffing tests/analysis/ext
cvs diff: Diffing tests/analysis/sharing
cvs diff: Diffing tests/analysis/table
cvs diff: Diffing tests/analysis/trail
cvs diff: Diffing tests/analysis/unused_args
cvs diff: Diffing tests/benchmarks
Index: tests/benchmarks/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/benchmarks/Mmakefile,v
retrieving revision 1.8
diff -u -b -r1.8 Mmakefile
--- tests/benchmarks/Mmakefile	22 Jan 2003 06:31:31 -0000	1.8
+++ tests/benchmarks/Mmakefile	15 Jul 2008 03:12:53 -0000
@@ -34,8 +34,9 @@
 endif
 
 TESTS=$(PROGS)
-SUBDIRS=
-TESTS_DIR=..
+TESTS = $(sort $(PROGS))
+SUBDIRS = 
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
cvs diff: Diffing tests/debugger
Index: tests/debugger/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.142
diff -u -b -r1.142 Mmakefile
--- tests/debugger/Mmakefile	25 Nov 2008 07:46:55 -0000	1.142
+++ tests/debugger/Mmakefile	25 Nov 2008 07:48:46 -0000
@@ -210,9 +210,9 @@
     endif
 endif
 
-SUBDIRS=declarative
-TESTS=$(PROGS)
-TESTS_DIR=..
+SUBDIRS = declarative
+TESTS = $(sort $(PROGS))
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # The minimum trace level in .decldebug grades is --trace decl.
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
Index: tests/dppd/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/dppd/Mmakefile,v
retrieving revision 1.7
diff -u -b -r1.7 Mmakefile
--- tests/dppd/Mmakefile	22 Jan 2003 00:50:35 -0000	1.7
+++ tests/dppd/Mmakefile	15 Jul 2008 03:13:29 -0000
@@ -12,7 +12,7 @@
 	PROGS = run
 endif
 
-TESTS = $(PROGS)
+TESTS = $(sort $(PROGS))
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
cvs diff: Diffing tests/general
Index: tests/general/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/general/Mmakefile,v
retrieving revision 1.55
diff -u -b -r1.55 Mmakefile
--- tests/general/Mmakefile	10 May 2007 05:55:38 -0000	1.55
+++ tests/general/Mmakefile	15 Jul 2008 03:14:37 -0000
@@ -106,8 +106,8 @@
 NOT_WORKING =	dnf
 
 SUBDIRS = accumulator string_format
-TESTS=$(PROGS)
-TESTS_DIR=..
+TESTS = $(sort $(PROGS))
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
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
Index: tests/grade_subdirs/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/grade_subdirs/Mmakefile,v
retrieving revision 1.3
diff -u -b -r1.3 Mmakefile
--- tests/grade_subdirs/Mmakefile	12 Jan 2003 22:33:18 -0000	1.3
+++ tests/grade_subdirs/Mmakefile	15 Jul 2008 03:14:49 -0000
@@ -20,9 +20,9 @@
 # `--use-grade-subdirs' doesn't work with Mmake.
 MMAKE_USE_MMC_MAKE=yes
 
-TESTS = $(PROGS)
+TESTS = $(sort $(PROGS))
 SUBDIRS = 
-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
Index: tests/hard_coded/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/hard_coded/Mmakefile,v
retrieving revision 1.360
diff -u -b -r1.360 Mmakefile
--- tests/hard_coded/Mmakefile	7 Oct 2008 05:27:43 -0000	1.360
+++ tests/hard_coded/Mmakefile	8 Oct 2008 03:27:26 -0000
@@ -641,7 +641,7 @@
 
 #-----------------------------------------------------------------------------#
 
-TESTS = $(PROGS)
+TESTS = $(sort $(PROGS))
 SUBDIRS = typeclasses sub-modules exceptions purity
 TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
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
Index: tests/invalid/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/invalid/Mmakefile,v
retrieving revision 1.231
diff -u -b -r1.231 Mmakefile
--- tests/invalid/Mmakefile	8 Sep 2008 04:35:54 -0000	1.231
+++ tests/invalid/Mmakefile	10 Sep 2008 03:22:42 -0000
@@ -335,9 +335,9 @@
 #-----------------------------------------------------------------------------#
 
 PROGS= $(SINGLEMODULE_PROGS) $(MULTIMODULE_PROGS)
-TESTS = $(MULTIMODULE_PROGS) $(SINGLEMODULE_PROGS:%=%-nodepend)
+TESTS = $(sort $(MULTIMODULE_PROGS) $(SINGLEMODULE_PROGS:%=%-nodepend))
 SUBDIRS = purity
-TESTS_DIR=..
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
Index: tests/mmc_make/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/mmc_make/Mmakefile,v
retrieving revision 1.5
diff -u -b -r1.5 Mmakefile
--- tests/mmc_make/Mmakefile	30 May 2007 05:15:08 -0000	1.5
+++ tests/mmc_make/Mmakefile	15 Jul 2008 03:17:11 -0000
@@ -21,9 +21,9 @@
     endif
 endif
 
-SUBDIRS=
-TESTS=$(PROGS)
-TESTS_DIR=..
+SUBDIRS =
+TESTS = $(sort $(PROGS))
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 %.runtest: %.res ;
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/par_conj
Index: tests/par_conj/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/par_conj/Mmakefile,v
retrieving revision 1.17
diff -u -b -r1.17 Mmakefile
--- tests/par_conj/Mmakefile	3 Nov 2008 06:39:46 -0000	1.17
+++ tests/par_conj/Mmakefile	3 Nov 2008 07:50:50 -0000
@@ -116,9 +116,9 @@
 
 #-----------------------------------------------------------------------------#
 
-TESTS = $(PROGS)
-SUBDIRS=
-TESTS_DIR=..
+TESTS = $(sort $(PROGS))
+SUBDIRS =
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
cvs diff: Diffing tests/recompilation
Index: tests/recompilation/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/recompilation/Mmakefile,v
retrieving revision 1.14
diff -u -b -r1.14 Mmakefile
--- tests/recompilation/Mmakefile	6 Jun 2007 01:48:13 -0000	1.14
+++ tests/recompilation/Mmakefile	15 Jul 2008 03:17:50 -0000
@@ -52,9 +52,9 @@
 		$(TESTS_SHOULD_FAIL)
 endif
 
-TESTS= $(PROGS:%=%-nodepend)
-SUBDIRS=
-TESTS_DIR=..
+TESTS= $(sort $(PROGS:%=%-nodepend))
+SUBDIRS =
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
cvs diff: Diffing tests/tabling
Index: tests/tabling/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/tabling/Mmakefile,v
retrieving revision 1.54
diff -u -b -r1.54 Mmakefile
--- tests/tabling/Mmakefile	8 Aug 2008 04:47:36 -0000	1.54
+++ tests/tabling/Mmakefile	8 Aug 2008 06:38:22 -0000
@@ -156,9 +156,9 @@
 	endif
 endif
 
-TESTS = $(PROGS)
-SUBDIRS=
-TESTS_DIR=..
+TESTS = $(sort $(PROGS))
+SUBDIRS =
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
cvs diff: Diffing tests/term
Index: tests/term/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/term/Mmakefile,v
retrieving revision 1.30
diff -u -b -r1.30 Mmakefile
--- tests/term/Mmakefile	30 May 2006 03:19:39 -0000	1.30
+++ tests/term/Mmakefile	15 Jul 2008 03:18:11 -0000
@@ -89,9 +89,9 @@
 
 #-----------------------------------------------------------------------------#
 
-TESTS=$(PROGS)
-SUBDIRS=
-TESTS_DIR=..
+TESTS = $(sort $(PROGS))
+SUBDIRS =
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 %.runtest: %.trans_opt_res ;
cvs diff: Diffing tests/trailing
Index: tests/trailing/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/trailing/Mmakefile,v
retrieving revision 1.6
diff -u -b -r1.6 Mmakefile
--- tests/trailing/Mmakefile	5 Sep 2008 11:19:34 -0000	1.6
+++ tests/trailing/Mmakefile	10 Sep 2008 03:22:45 -0000
@@ -20,9 +20,9 @@
 
 #-----------------------------------------------------------------------------#
 
-TESTS = $(PROGS)
+TESTS = $(sort $(PROGS))
 SUBDIRS = 
-TESTS_DIR=..
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
cvs diff: Diffing tests/valid
Index: tests/valid/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.221
diff -u -b -r1.221 Mmakefile
--- tests/valid/Mmakefile	30 Oct 2008 06:45:59 -0000	1.221
+++ tests/valid/Mmakefile	30 Oct 2008 10:13:27 -0000
@@ -420,9 +420,9 @@
 
 #-----------------------------------------------------------------------------#
 
-TESTS = $(PROGS)
-SUBDIRS=
-TESTS_DIR=..
+TESTS = $(sort $(PROGS))
+SUBDIRS = 
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # When compiling using the installed libraries, setting GRADEFLAGS may
cvs diff: Diffing tests/warnings
Index: tests/warnings/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/warnings/Mmakefile,v
retrieving revision 1.45
diff -u -b -r1.45 Mmakefile
--- tests/warnings/Mmakefile	4 Jun 2008 03:55:47 -0000	1.45
+++ tests/warnings/Mmakefile	15 Jul 2008 03:18:49 -0000
@@ -45,9 +45,9 @@
 
 PROGS=$(COMPILE_PROGS) $(ERRORCHECK_PROGS) up_to_date
 
-TESTS = $(PROGS)
-SUBDIRS=
-TESTS_DIR=..
+TESTS = $(sort $(PROGS))
+SUBDIRS =
+TESTS_DIR = ..
 include $(TESTS_DIR)/Mmake.common
 
 # Module-specific options should go in Mercury.options so they
cvs diff: Diffing tools
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.206
diff -u -b -r1.206 bootcheck
--- tools/bootcheck	3 Oct 2008 03:49:02 -0000	1.206
+++ tools/bootcheck	3 Oct 2008 07:40:09 -0000
@@ -942,7 +942,7 @@
         if (cd $stage2dir && \
             $MMAKE $mmake_opts dep_library dep_mdbcomp \
             dep_browser dep_ssdb dep_compiler \
-            dep_profiler dep_deep_profiler)
+            dep_slice dep_profiler dep_deep_profiler)
         then
             echo "building of stage 2 dependencies successful"
         else
@@ -951,7 +951,7 @@
         fi
 
         if (cd $stage2dir/library && \
-            $MMAKE $mmake_opts $jfactor mercury)
+            $MMAKE $mmake_opts $jfactor all-ints mercury)
         then
             echo "building of stage 2 library successful"
         else
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
--------------------------------------------------------------------------