projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove --extra flag from darcs-all
[ghc-hetmet.git]
/
validate
diff --git
a/validate
b/validate
index
b364f57
..
889daae
100644
(file)
--- a/
validate
+++ b/
validate
@@
-48,16
+48,21
@@
done
if [ "$CPUS" = "" ]; then
threads=2
else
if [ "$CPUS" = "" ]; then
threads=2
else
- threads=$((($CPUS + 1) * 2)) # `expr $CPUS + 1`
+ threads=$(($CPUS + 1)) # `expr $CPUS + 1`
fi
if [ $testsuite_only -eq 0 ]; then
if [ $no_clean -eq 0 ]; then
if [ -f mk/config.mk ]; then
fi
if [ $testsuite_only -eq 0 ]; then
if [ $no_clean -eq 0 ]; then
if [ -f mk/config.mk ]; then
- make distclean
+ make maintainer-clean
fi
fi
+ INSTDIR=`pwd`/inst
+ if [ "$OSTYPE" = "cygwin" ]
+ then
+ INSTDIR=`cygpath -m "$INSTDIR"`
+ fi
case $OSTYPE in
cygwin|msys) config_args=--build=i386-unknown-mingw32
if [ -f c:/mingw/bin/gcc.exe ]
case $OSTYPE in
cygwin|msys) config_args=--build=i386-unknown-mingw32
if [ -f c:/mingw/bin/gcc.exe ]
@@
-72,10
+77,10
@@
if [ $no_clean -eq 0 ]; then
esac
sh boot
esac
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
echo "Validating=YES" > mk/are-validating.mk
@@
-130,13
+135,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 "-------------------------------------------------------------------"