Commit e3df1b1e authored by thomie's avatar thomie

Validate: explain THREADS instead of CPUS in --help

parent 0d1a8d09
...@@ -50,4 +50,4 @@ script: ...@@ -50,4 +50,4 @@ script:
- if [ "$DEBUG_STAGE2" = "YES" ]; then echo 'GhcStage2HcOpts += -DDEBUG' >> mk/validate.mk; fi - if [ "$DEBUG_STAGE2" = "YES" ]; then echo 'GhcStage2HcOpts += -DDEBUG' >> mk/validate.mk; fi
# Don't use --quiet, as it might cause the testsuite to not print output for # Don't use --quiet, as it might cause the testsuite to not print output for
# over 10 minutes, causing Travis to kill our job. # over 10 minutes, causing Travis to kill our job.
- CPUS=2 SKIP_PERF_TESTS=YES ./validate --fast - THREADS=3 SKIP_PERF_TESTS=YES ./validate --fast
...@@ -20,17 +20,18 @@ Flags: ...@@ -20,17 +20,18 @@ Flags:
HTML generated here: testsuite/hpc_output/hpc_index.html HTML generated here: testsuite/hpc_output/hpc_index.html
--fast Omit dyn way, omit binary distribution --fast Omit dyn way, omit binary distribution
--slow Build stage2 with -DDEBUG. Skips tests that call --slow Build stage2 with -DDEBUG. Skips tests that call
`compiler_stats_num_field`. compiler_stats_num_field.
2008-07-01: 14% slower than the default. 2008-07-01: 14% slower than the default.
--dph: Also build libraries/dph and run associated tests. --dph Also build libraries/dph and run associated tests.
--quiet: More pretty build log. --quiet More pretty build log.
See Note [Default build system verbosity]. See Note [Default build system verbosity].
--help shows this usage help. --help shows this usage help.
Set environment variable 'CPUS' to number of cores, to exploit validate runs 'make -j\$THREADS', where by default THREADS is the number of
multiple cpu cores, e.g. cpus your computer has +1. You can set the environment variable THREADS to
override this. For a sequential build you would for example use
CPUS=8 ./validate THREADS=1 ./validate
EOF EOF
} }
...@@ -121,8 +122,6 @@ detect_cpu_count () { ...@@ -121,8 +122,6 @@ detect_cpu_count () {
# nothing helped # nothing helped
CPUS="1" CPUS="1"
fi fi
echo "using ${CPUS} CPUs" >&2
} }
detect_cpu_count detect_cpu_count
...@@ -139,6 +138,8 @@ else ...@@ -139,6 +138,8 @@ else
threads="$THREADS" threads="$THREADS"
fi fi
echo "using THREADS=${threads}" >&2
if type gmake > /dev/null 2> /dev/null if type gmake > /dev/null 2> /dev/null
then then
make="gmake" make="gmake"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment