summaryrefslogtreecommitdiff
path: root/validate
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2018-07-06 10:57:55 -0400
committerBen Gamari <ben@smart-cactus.org>2018-07-06 14:08:37 -0400
commitde95bf40ee0af0e7da4cb6cc4e0ad33694234bb9 (patch)
tree13ee71ca22f5a3610900ad7ce49f9fa635e2c6b3 /validate
parent8c628ad9b9241dcf4ea087ca9efa5f0ca9632aa5 (diff)
downloadhaskell-de95bf40ee0af0e7da4cb6cc4e0ad33694234bb9.tar.gz
circleci: Detect core count
Test Plan: Try `./validate`, CircleCI build; make sure core count detection works in both cases. Reviewers: alpmestan Reviewed By: alpmestan Subscribers: rwbarton, thomie, carter GHC Trac Issues: #14470 Differential Revision: https://phabricator.haskell.org/D4897
Diffstat (limited to 'validate')
-rwxr-xr-xvalidate24
1 files changed, 1 insertions, 23 deletions
diff --git a/validate b/validate
index 0332e5b1ec..2f82b2800b 100755
--- a/validate
+++ b/validate
@@ -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