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="$THREADS"
+fi
+
+if type gmake > /dev/null 2> /dev/null
+then
+ make="gmake"
else
- threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+ make="make"
fi
if [ $testsuite_only -eq 0 ]; then
if [ $no_clean -eq 0 ]; then
- make maintainer-clean NO_CLEAN_GMP=YES
+ $make maintainer-clean NO_CLEAN_GMP=YES
INSTDIR=`pwd`/inst
if [ "$OSTYPE" = "cygwin" ]
INSTDIR=`cygpath -m "$INSTDIR"`
fi
- sh boot
+ /usr/bin/perl -w boot --required-tag=dph
./configure --prefix="$INSTDIR" $config_args
fi
-thisdir=`utils/ghc-pwd/ghc-pwd`
+thisdir=`utils/ghc-pwd/dist-boot/ghc-pwd`
echo "Validating=YES" > mk/are-validating.mk
-make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+$make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
-make binary-dist-prep
-make -C bindisttest TEST_PREP=YES
+$make binary-dist-prep
+$make test_bindist TEST_PREP=YES
fi # testsuite-only
rm -f $HPCTIXFILE
fi
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
+if [ "$slow" = YES ]
+then
+MAKE_TEST_TARGET=fulltest
+else
+MAKE_TEST_TARGET=test
+fi
+
+$make $MAKE_TEST_TARGET stage=2 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
if [ "$hpc" = YES ]
then