From 6fa2643e63e8172b74bb08e37c9b4de587da028f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 20 Mar 2017 12:48:44 +0100
Subject: [PATCH] package/ci: get rid of JOBS_LIMIT and hardcode the value
 instead.

No need to have that configurable.
---
 package/ci/travis-android-arm.sh  | 3 ++-
 package/ci/travis-desktop-gles.sh | 3 ++-
 package/ci/travis-desktop.sh      | 3 ++-
 package/ci/travis-emscripten.sh   | 1 +
 package/ci/travis.yml             | 9 ---------
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/package/ci/travis-android-arm.sh b/package/ci/travis-android-arm.sh
index f3e696481..d3d29cd24 100755
--- a/package/ci/travis-android-arm.sh
+++ b/package/ci/travis-android-arm.sh
@@ -51,7 +51,8 @@ ANDROID_NDK=$TRAVIS_BUILD_DIR/android-ndk-r10e cmake .. \
     -DWITH_TGAIMPORTER=ON \
     -DWITH_WAVAUDIOIMPORTER=OFF \
     -DBUILD_TESTS=ON
-make -j${JOBS_LIMIT}
+# Otherwise the job gets killed (probably because using too much memory)
+make -j4
 
 # Start simulator and run tests
 echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
diff --git a/package/ci/travis-desktop-gles.sh b/package/ci/travis-desktop-gles.sh
index 6451aa290..e4275f662 100755
--- a/package/ci/travis-desktop-gles.sh
+++ b/package/ci/travis-desktop-gles.sh
@@ -39,5 +39,6 @@ cmake .. \
     -DWITH_AL_INFO=ON \
     -DBUILD_TESTS=ON \
     -DBUILD_GL_TESTS=ON
-make -j${JOBS_LIMIT}
+# Otherwise the job gets killed (probably because using too much memory)
+make -j4
 CORRADE_TEST_COLOR=ON ctest -V -E GLTest
diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh
index 60bb293ca..6ea55f820 100755
--- a/package/ci/travis-desktop.sh
+++ b/package/ci/travis-desktop.sh
@@ -38,5 +38,6 @@ cmake .. \
     -DWITH_AL_INFO=ON \
     -DBUILD_TESTS=ON \
     -DBUILD_GL_TESTS=ON
-make -j${JOBS_LIMIT}
+# Otherwise the job gets killed (probably because using too much memory)
+make -j4
 ASAN_OPTIONS="color=always" LSAN_OPTIONS="color=always suppressions=$TRAVIS_BUILD_DIR/package/ci/leaksanitizer.conf" CORRADE_TEST_COLOR=ON ctest -V -E GLTest
diff --git a/package/ci/travis-emscripten.sh b/package/ci/travis-emscripten.sh
index 545e02927..846341499 100755
--- a/package/ci/travis-emscripten.sh
+++ b/package/ci/travis-emscripten.sh
@@ -56,6 +56,7 @@ cmake .. \
     -DWITH_WAVAUDIOIMPORTER=ON \
     -DBUILD_TESTS=ON \
     -DTARGET_GLES2=$TARGET_GLES2
+# Otherwise the job gets killed (probably because using too much memory)
 make -j4
 
 # Test
diff --git a/package/ci/travis.yml b/package/ci/travis.yml
index 1f02dca5e..8b24157c4 100644
--- a/package/ci/travis.yml
+++ b/package/ci/travis.yml
@@ -17,15 +17,12 @@ matrix:
     compiler: gcc
     env:
     - TARGET=desktop
-    # Otherwise the job gets killed (probably because using too much memory)
-    - JOBS_LIMIT=4
   - language: cpp
     os: linux
     compiler: clang
     env:
     - TARGET=desktop-sanitizers
     - CMAKE_CXX_FLAGS=-fsanitize=address
-    - JOBS_LIMIT=4
     addons:
       apt:
         sources:
@@ -42,7 +39,6 @@ matrix:
     env:
     - TARGET=desktop-gles
     - TARGET_GLES2=ON
-    - JOBS_LIMIT=4
   # Disabled because the Ubuntu 12.04 drivers are missing some ES3 entrypoints
   # Should be enabled after moving to 14.04
   #- language: cpp
@@ -51,7 +47,6 @@ matrix:
     #env:
     #- TARGET=desktop-gles
     #- TARGET_GLES2=OFF
-    #- JOBS_LIMIT=4
   - language: cpp
     os: osx
     compiler: clang
@@ -85,8 +80,6 @@ matrix:
     env:
     - TARGET=android
     - TARGET_GLES2=ON
-    # Otherwise the job gets killed (probably because using too much memory)
-    - JOBS_LIMIT=4
     android:
       components:
       - build-tools-19.0.0
@@ -97,8 +90,6 @@ matrix:
     env:
     - TARGET=android
     - TARGET_GLES2=OFF
-    # Otherwise the job gets killed (probably because using too much memory)
-    - JOBS_LIMIT=4
     android:
       components:
       - build-tools-19.0.0