projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small DynFlags improvements
[ghc-hetmet.git]
/
validate
diff --git
a/validate
b/validate
old mode 100644
(file)
new mode 100755
(executable)
index
bf007ab
..
b1ae14f
--- a/
validate
+++ b/
validate
@@
-55,10
+55,17
@@
else
threads="$THREADS"
fi
threads="$THREADS"
fi
+if type gmake > /dev/null 2> /dev/null
+then
+ make="gmake"
+else
+ make="make"
+fi
+
if [ $testsuite_only -eq 0 ]; then
if [ $no_clean -eq 0 ]; then
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" ]
@@
-66,18
+73,18
@@
if [ $no_clean -eq 0 ]; then
INSTDIR=`cygpath -m "$INSTDIR"`
fi
INSTDIR=`cygpath -m "$INSTDIR"`
fi
- /usr/bin/perl -w boot
+ /usr/bin/perl -w boot --validate --required-tag=dph
./configure --prefix="$INSTDIR" $config_args
fi
./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
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
@@
-91,7
+98,14
@@
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
+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
if [ "$hpc" = YES ]
then