projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use mkFunTy to ensure that invariants are respected
[ghc-hetmet.git]
/
validate
diff --git
a/validate
b/validate
index
741daac
..
5becd3f
100644
(file)
--- a/
validate
+++ b/
validate
@@
-45,16
+45,27
@@
do
shift
done
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
else
- threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+ make="make"
fi
if [ $testsuite_only -eq 0 ]; then
if [ $no_clean -eq 0 ]; then
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=`pwd`/inst
if [ "$OSTYPE" = "cygwin" ]
@@
-62,7
+73,7
@@
if [ $no_clean -eq 0 ]; then
INSTDIR=`cygpath -m "$INSTDIR"`
fi
INSTDIR=`cygpath -m "$INSTDIR"`
fi
- sh boot
+ /usr/bin/perl -w boot
./configure --prefix="$INSTDIR" $config_args
fi
./configure --prefix="$INSTDIR" $config_args
fi
@@
-70,10
+81,10
@@
thisdir=`utils/ghc-pwd/ghc-pwd`
echo "Validating=YES" > mk/are-validating.mk
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
fi # testsuite-only
@@
-87,7
+98,7
@@
then
rm -f $HPCTIXFILE
fi
rm -f $HPCTIXFILE
fi
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
+$make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
if [ "$hpc" = YES ]
then
if [ "$hpc" = YES ]
then