projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak the Makefile code for making .a libs; fixes trac #3642
[ghc-hetmet.git]
/
validate
diff --git
a/validate
b/validate
index
5d0afb4
..
01d6a82
100644
(file)
--- a/
validate
+++ b/
validate
@@
-45,37
+45,40
@@
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=`expr $CPUS + 1`
+ threads="$THREADS"
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
- if [ -f mk/config.mk ]; then
- make distclean
- fi
+ make maintainer-clean NO_CLEAN_GMP=YES
- case $OSTYPE in
- cygwin|msys) config_args=--build=i386-unknown-mingw32
- if [ -f c:/mingw/bin/gcc.exe ]
- then
- config_args="$config_args --with-gcc=c:/mingw/bin/gcc"
- fi
- ;;
- esac
+ INSTDIR=`pwd`/inst
+ if [ "$OSTYPE" = "cygwin" ]
+ then
+ INSTDIR=`cygpath -m "$INSTDIR"`
+ fi
sh boot
sh boot
- ./configure "--prefix=`pwd`/inst" $config_args
+ ./configure --prefix="$INSTDIR" $config_args
fi
fi
-thisdir=`utils/pwd/pwd forwardslash`
+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 -C bindisttest TEST_PREP=YES
+
fi # testsuite-only
if [ "$hpc" = YES ]
fi # testsuite-only
if [ "$hpc" = YES ]
@@
-88,7
+91,7
@@
then
rm -f $HPCTIXFILE
fi
rm -f $HPCTIXFILE
fi
-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
@@
-119,6
+122,9
@@
WARNING: You seem to have things set in mk/validate.mk. Please check
that it is OK before pushing.
EOF
fi
that it is OK before pushing.
EOF
fi
+ cat <<EOF
+-------------------------------------------------------------------
+EOF
else
cat <<EOF
I didn't find any problems, but this wasn't a complete validate run,
else
cat <<EOF
I didn't find any problems, but this wasn't a complete validate run,
@@
-126,13
+132,15
@@
so be careful!
NOTE: If you have made changes that may cause failures not tested for by
the minimal testing procedure, please do further testing as necessary.
NOTE: If you have made changes that may cause failures not tested for by
the minimal testing procedure, please do further testing as necessary.
+-------------------------------------------------------------------
EOF
fi
else
cat <<EOF
Oops! Looks like you have some unexpected test results or framework failures.
Please fix them before pushing/sending patches.
EOF
fi
else
cat <<EOF
Oops! Looks like you have some unexpected test results or framework failures.
Please fix them before pushing/sending patches.
+-------------------------------------------------------------------
EOF
EOF
+ exit 1
fi
fi
-echo "-------------------------------------------------------------------"