aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2019-10-14 17:28:40 +0200
committerLinus Jahn <lnj@kaidan.im>2019-10-14 17:33:59 +0200
commit438ae3683012c7e2e128c6e56980aa3b344d1a48 (patch)
tree491bb8fce0e2e2b324124d609941e290100392e0 /tests
parent08aa8d0aa5f79d41725d06da60bc46dd57c61118 (diff)
downloadqxmpp-438ae3683012c7e2e128c6e56980aa3b344d1a48.tar.gz
travis: Build with all available threads
Diffstat (limited to 'tests')
-rwxr-xr-xtests/travis/build-and-test10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test
index ba766999..65972231 100755
--- a/tests/travis/build-and-test
+++ b/tests/travis/build-and-test
@@ -1,6 +1,7 @@
#!/bin/sh
set -e
+HOST_SYSTEM=$(uname -s)
CMAKE_ARGS="-DBUILD_TESTS:BOOL=True"
case "$CONFIG" in
@@ -15,7 +16,7 @@ case "$CONFIG" in
;;
esac
-if [ "$(uname -s)" = "Darwin" ]; then
+if [ $HOST_SYSTEM = "Darwin" ]; then
# pick up cmake files from homebrew
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5"
else
@@ -33,7 +34,12 @@ fi
mkdir build
cd build
cmake .. $CMAKE_ARGS
-make -k
+
+if [ $HOST_SYSTEM = "Darwin" ]; then
+ make -k -j$(sysctl -n hw.logicalcpu)
+else
+ make -k -j$(nproc)
+fi
# run tests
make test