Undo part of #4003 patch

[ghc-hetmet.git] / validate

diff --git a/validate b/validate
index 741daac..236fd07 100644 (file)
--- a/validate
+++ b/validate
@@ -45,10 +45,14 @@ do
     shift
 done
 
-if [ "$CPUS" = "" ]; then
-    threads=2
+if [ "$THREADS" = "" ]; then
+    if [ "$CPUS" = "" ]; then
+        threads=2
+    else
+        threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+    fi
 else
-    threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+    threads="$THREADS"
 fi
 
 if [ $testsuite_only -eq 0 ]; then
@@ -62,7 +66,7 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
-    sh boot
+    /usr/bin/perl -w boot
     ./configure --prefix="$INSTDIR" $config_args
 fi
 
@@ -73,7 +77,7 @@ echo "Validating=YES" > mk/are-validating.mk
 make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
 
 make binary-dist-prep
-make -C bindisttest TEST_PREP=YES
+make test_bindist TEST_PREP=YES
 
 fi # testsuite-only