projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-engineer the derived Ord instance generation code (fix Trac #4019)
[ghc-hetmet.git]
/
validate
diff --git
a/validate
b/validate
index
a042664
..
236fd07
100644
(file)
--- a/
validate
+++ b/
validate
@@
-45,10
+45,14
@@
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
else
- threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+ threads="$THREADS"
fi
if [ $testsuite_only -eq 0 ]; then
fi
if [ $testsuite_only -eq 0 ]; then
@@
-62,7
+66,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
@@
-71,6
+75,10
@@
thisdir=`utils/ghc-pwd/ghc-pwd`
echo "Validating=YES" > mk/are-validating.mk
make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
echo "Validating=YES" > mk/are-validating.mk
make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+make binary-dist-prep
+make test_bindist TEST_PREP=YES
+
fi # testsuite-only
if [ "$hpc" = YES ]
fi # testsuite-only
if [ "$hpc" = YES ]
@@
-83,10
+91,7
@@
then
rm -f $HPCTIXFILE
fi
rm -f $HPCTIXFILE
fi
-make binary-dist-prep
-make -C bindisttest TEST_PREP=YES
-
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 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