X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=validate;h=01d6a829e604270d697028b3be8bcaf07f3d83f4;hb=a55f15d82f16468f7bc492fa8ebd635b16b83277;hp=23772c536a51fb78c53d32e1ef0f37cdb04ff9f1;hpb=e454ee6b88366fbaf9861dcb483417a9a574cec2;p=ghc-hetmet.git diff --git a/validate b/validate index 23772c5..01d6a82 100644 --- a/validate +++ b/validate @@ -45,10 +45,14 @@ do 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=$(($CPUS + 1)) # `expr $CPUS + 1` + threads="$THREADS" fi if [ $testsuite_only -eq 0 ]; then @@ -87,7 +91,7 @@ then 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