ghc.mk: fix list for dll-split on GHCi-less builds
[ghc.git] / validate
index 95425d3..c6e6d69 100755 (executable)
--- a/validate
+++ b/validate
@@ -22,6 +22,7 @@ Flags:
   --fast            Omit dyn way, omit binary distribution
   --slow            Build stage2 with -DDEBUG.
                     2008-07-01: 14% slower than the default.
+  --dph:            Also build libraries/dph and run associated tests.
   --help            shows this usage help.
 
   Set environment variable 'CPUS' to number of cores, to exploit
@@ -36,6 +37,8 @@ no_clean=0
 testsuite_only=0
 hpc=NO
 speed=NORMAL
+use_dph=0
+be_quiet=0
 
 while [ $# -gt 0 ]
 do
@@ -58,6 +61,15 @@ do
     --normal)
         speed=NORMAL
         ;;
+    --no-dph) # for backward compat
+        use_dph=0
+        ;;
+    --dph)
+        use_dph=1
+        ;;
+    --quiet)
+        be_quiet=1
+        ;;
     --help)
         show_help
         exit 0;;
@@ -80,28 +92,57 @@ check_packages () {
     echo "== End $1 package check"
 }
 
+detect_cpu_count () {
+    if [ "$CPUS" = "" ]; then
+        # Windows standard environment variable
+        CPUS="$NUMBER_OF_PROCESSORS"
+    fi
+
+    if [ "$CPUS" = "" ]; then
+        # Linux
+        CPUS=`getconf _NPROCESSORS_ONLN 2>/dev/null`
+    fi
+
+    if [ "$CPUS" = "" ]; then
+        # FreeBSD
+        CPUS=`getconf NPROCESSORS_ONLN 2>/dev/null`
+    fi
+
+    if [ "$CPUS" = "" ]; then
+        # nothing helped
+        CPUS="1"
+    fi
+
+    echo "using ${CPUS} CPUs" >&2
+}
+
+detect_cpu_count
+
 if ! [ -d testsuite ]
 then
-    echo 'You need the testsuite to validate' >&2
-    echo 'Run "./sync-all --testsuite get" to get it' >&2
+    echo 'Could not find the testsuite for validation' >&2
     exit 1
 fi
 
 if [ "$THREADS" = "" ]; then
-    if [ "$CPUS" = "" ]; then
-        threads=2
-    else
-        threads=$(($CPUS + 1)) # `expr $CPUS + 1`
-    fi
+    threads=$(($CPUS + 1)) # `expr $CPUS + 1`
 else
     threads="$THREADS"
 fi
 
 if type gmake > /dev/null 2> /dev/null
 then
-    make="gmake"
+    if [ $be_quiet -eq 1 ]; then
+        make="gmake -s"
+    else
+        make="gmake"
+    fi
 else
-    make="make"
+    if [ $be_quiet -eq 1 ]; then
+        make="make -s"
+    else
+        make="make"
+    fi
 fi
 
 if [ $testsuite_only -eq 0 ]; then
@@ -115,7 +156,11 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
-    /usr/bin/perl -w boot --validate --required-tag=dph
+    if [ $use_dph -eq 1 ]; then
+        /usr/bin/perl -w boot --validate --required-tag=dph
+    else
+        /usr/bin/perl -w boot --validate
+    fi
     ./configure --prefix="$INSTDIR" $config_args
 fi
 
@@ -125,6 +170,17 @@ echo "Validating=YES"       >  mk/are-validating.mk
 echo "ValidateSpeed=$speed" >> mk/are-validating.mk
 echo "ValidateHpc=$hpc"     >> mk/are-validating.mk
 
+if [ $be_quiet -eq 1 ]; then
+    echo "V=0"              >> mk/are-validating.mk # Less gunk
+    echo "GhcHcOpts="       >> mk/are-validating.mk # Remove -Rghc-timing
+fi
+
+if [ $use_dph -eq 1 ]; then
+    echo "BUILD_DPH=YES"    >> mk/are-validating.mk
+else
+    echo "BUILD_DPH=NO"     >> mk/are-validating.mk
+fi
+
 $make -j$threads
 # For a "debug make", add "--debug=b --debug=m"
 
@@ -182,7 +238,12 @@ FAST)
         ;;
 esac
 
-$make $MAKE_TEST_TARGET stage=2 $BINDIST THREADS=$threads 2>&1 | tee testlog
+verbosity=3
+if [ $be_quiet -eq 1 ]; then
+   verbosity=2
+fi
+
+$make $MAKE_TEST_TARGET stage=2 $BINDIST VERBOSE=$verbosity THREADS=$threads 2>&1 | tee testlog
 
 check_packages post-testsuite