[zorg] r315846 - [zorg] Replace cpuinfo with nproc

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Sat Oct 14 21:29:41 2017
New Revision: 315846

URL: http://llvm.org/viewvc/llvm-project?rev=315846&view=rev
Log:
[zorg] Replace cpuinfo with nproc

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh?rev=315846&r1=315845&r2=315846&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Sat Oct 14 21:29:41 2017
@@ -25,7 +25,7 @@ fi
 rm -rf compiler_rt_build llvm_build64 llvm_build_ninja symbolizer_build*
 
 SUPPORTS_32_BITS=${SUPPORTS_32_BITS:-1}
-MAKE_JOBS=${MAX_MAKE_JOBS:-$(grep -c '^processor' /proc/cpuinfo)}
+MAKE_JOBS=${MAX_MAKE_JOBS:-$(nproc)}
 LLVM=$ROOT/llvm
 ZLIB=$ROOT/zlib
 COMPILER_RT=$LLVM/projects/compiler-rt

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh?rev=315846&r1=315845&r2=315846&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh Sat Oct 14 21:29:41 2017
@@ -14,7 +14,7 @@ export PATH="/usr/local/bin:$PATH"
 CHECK_LIBCXX=${CHECK_LIBCXX:-0}
 CHECK_LLD=${CHECK_LLD:-1}
 STAGE1_DIR=llvm_build0
-MAKE_JOBS=${MAX_MAKE_JOBS:-$(grep -c '^processor' /proc/cpuinfo)}
+MAKE_JOBS=${MAX_MAKE_JOBS:-$(nproc)}
 LLVM=$ROOT/llvm
 LIBFUZZER=$LLVM/lib/Fuzzer
 # No assertions. Need to clean up the existing assertion failures first.

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh?rev=315846&r1=315845&r2=315846&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh Sat Oct 14 21:29:41 2017
@@ -24,7 +24,7 @@ fi
 
 ROOT=`pwd`
 PLATFORM=`uname`
-MAKE_JOBS=${MAX_MAKE_JOBS:-$(grep -c '^processor' /proc/cpuinfo)}
+MAKE_JOBS=${MAX_MAKE_JOBS:-$(nproc)}
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}