diff options
Diffstat (limited to 'validate')
| -rwxr-xr-x | validate | 36 |
1 files changed, 5 insertions, 31 deletions
@@ -119,29 +119,7 @@ check_packages () { fi } -detect_cpu_count () { - if [ "$CPUS" = "" ]; then - # Windows standard environment variable - CPUS="$NUMBER_OF_PROCESSORS" - fi - - if [ "$CPUS" = "" ]; then - # Linux - CPUS=`getconf _NPROCESSORS_ONLN 2>/dev/null` - fi - - if [ "$CPUS" = "" ]; then - # FreeBSD - CPUS=`getconf NPROCESSORS_ONLN 2>/dev/null` - fi - - if [ "$CPUS" = "" ]; then - # nothing helped - CPUS="1" - fi -} - -detect_cpu_count +CPUS=`mk/detect-cpu-count.sh` if ! [ -d testsuite ] then @@ -181,9 +159,9 @@ if [ $no_clean -eq 0 ]; then INSTDIR="$thisdir/inst" if [ $use_dph -eq 1 ]; then - perl -w boot --validate --required-tag=dph + python3 ./boot --validate --required-tag=dph else - perl -w boot --validate + python3 ./boot --validate fi ./configure --prefix="$INSTDIR" $config_args fi @@ -207,12 +185,6 @@ if [ $be_quiet -eq 1 ]; then echo "V=0" >> mk/are-validating.mk # Less gunk fi -if [ $use_dph -eq 1 ]; then - echo "BUILD_DPH=YES" >> mk/are-validating.mk -else - echo "BUILD_DPH=NO" >> mk/are-validating.mk -fi - $make -j$threads # For a "debug make", add "--debug=b --debug=m" @@ -296,6 +268,7 @@ rm -f testsuite_summary.txt testsuite_summary_stage1.txt $make -C testsuite/tests $BINDIST $PYTHON_ARG \ $MAKE_TEST_TARGET stage=2 LOCAL=0 $TEST_VERBOSITY THREADS=$threads \ NO_PRINT_SUMMARY=YES SUMMARY_FILE=../../testsuite_summary.txt \ + JUNIT_FILE=../../testsuite.xml \ 2>&1 | tee testlog # Run a few tests using the stage1 compiler. @@ -304,6 +277,7 @@ $make -C testsuite/tests $BINDIST $PYTHON_ARG \ $make -C testsuite/tests/stage1 $PYTHON_ARG \ $MAKE_TEST_TARGET stage=1 LOCAL=0 $TEST_VERBOSITY THREADS=$threads \ NO_PRINT_SUMMARY=YES SUMMARY_FILE=../../../testsuite_summary_stage1.txt \ + JUNIT_FILE=../../../testsuite_stage1.xml \ 2>&1 | tee testlog-stage1 echo |