Comments only
[ghc.git] / validate
index 5f24e19..827815f 100755 (executable)
--- a/validate
+++ b/validate
@@ -18,9 +18,9 @@ Flags:
                     compiler the test suite covers.
                     2008-07-01: 63% slower than the default.
                     HTML generated here: testsuite/hpc_output/hpc_index.html
-  --fast            Omit dyn way, omit binary distribution
-  --slow            Build stage2 with -DDEBUG. Skips tests that call
-                    compiler_stats_num_field.
+  --fast            Omit binary distribution. Omit certain tests.
+  --slow            Build stage2 with -DDEBUG. Run tests for all WAYS,
+                    but skip those that call compiler_stats_num_field.
                     2008-07-01: 14% slower than the default.
   --dph             Also build libraries/dph and run associated tests.
   --quiet           More pretty build log.
@@ -174,9 +174,7 @@ fi
 
 thisdir=`utils/ghc-pwd/dist-boot/ghc-pwd`
 
-echo "Validating=YES"       >  mk/are-validating.mk
-echo "ValidateSpeed=$speed" >> mk/are-validating.mk
-echo "ValidateHpc=$hpc"     >> mk/are-validating.mk
+make_settings="Validating=YES ValidateSpeed=$speed ValidateHpc=$hpc"
 
 # Note [Default build system verbosity].
 #
@@ -190,21 +188,14 @@ echo "ValidateHpc=$hpc"     >> mk/are-validating.mk
 # `make -s`, when user explicitly asks for it with `./validate --quiet`.
 if [ $be_quiet -eq 1 ]; then
     # See Note [Default build system verbosity].
-    echo "V=0"                  >> mk/are-validating.mk # Less gunk
-fi
-
-if [ $speed != "FAST" ]; then
-    # Build the "extra" packages (see ./packages), to enable more tests.
-    echo "BUILD_EXTRA_PKGS=YES" >> mk/are-validating.mk
+    make_settings="$make_settings V=0"
 fi
 
 if [ $use_dph -eq 1 ]; then
-    echo "BUILD_DPH=YES"    >> mk/are-validating.mk
-else
-    echo "BUILD_DPH=NO"     >> mk/are-validating.mk
+    make_settings="$make_settings BUILD_DPH=YES"
 fi
 
-$make -j$threads
+$make -j$threads $make_settings
 # For a "debug make", add "--debug=b --debug=m"
 
 check_packages post-build
@@ -214,8 +205,8 @@ check_packages post-build
 
 if [ $speed != "FAST" ]; then
 
-    $make binary-dist-prep
-    $make test_bindist TEST_PREP=YES
+    $make binary-dist-prep $make_settings
+    $make test_bindist TEST_PREP=YES $make_settings
 
     #
     # Install the xhtml package into the bindist.
@@ -226,7 +217,7 @@ if [ $speed != "FAST" ]; then
 
     check_packages post-install
 
-    $make validate_build_xhtml BINDIST_PREFIX="$thisdir/$bindistdir"
+    $make validate_build_xhtml BINDIST_PREFIX="$thisdir/$bindistdir" $make_settings
 
     check_packages post-xhtml
 fi
@@ -248,11 +239,11 @@ fi
 
 case "$speed" in
 SLOW)
-        MAKE_TEST_TARGET=fulltest
+        MAKE_TEST_TARGET=slowtest
         BINDIST="BINDIST=YES"
         ;;
 NORMAL)
-        MAKE_TEST_TARGET=fasttest
+        MAKE_TEST_TARGET=test
         BINDIST="BINDIST=YES"
         ;;
 FAST)