Browse Source

package/ci: get rid of JOBS_LIMIT and hardcode the value instead.

No need to have that configurable.
pull/197/head
Vladimír Vondruš 9 years ago
parent
commit
6fa2643e63
  1. 3
      package/ci/travis-android-arm.sh
  2. 3
      package/ci/travis-desktop-gles.sh
  3. 3
      package/ci/travis-desktop.sh
  4. 1
      package/ci/travis-emscripten.sh
  5. 9
      package/ci/travis.yml

3
package/ci/travis-android-arm.sh

@ -51,7 +51,8 @@ ANDROID_NDK=$TRAVIS_BUILD_DIR/android-ndk-r10e cmake .. \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=OFF \ -DWITH_WAVAUDIOIMPORTER=OFF \
-DBUILD_TESTS=ON -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 # Start simulator and run tests
echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a

3
package/ci/travis-desktop-gles.sh

@ -39,5 +39,6 @@ cmake .. \
-DWITH_AL_INFO=ON \ -DWITH_AL_INFO=ON \
-DBUILD_TESTS=ON \ -DBUILD_TESTS=ON \
-DBUILD_GL_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 CORRADE_TEST_COLOR=ON ctest -V -E GLTest

3
package/ci/travis-desktop.sh

@ -38,5 +38,6 @@ cmake .. \
-DWITH_AL_INFO=ON \ -DWITH_AL_INFO=ON \
-DBUILD_TESTS=ON \ -DBUILD_TESTS=ON \
-DBUILD_GL_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 ASAN_OPTIONS="color=always" LSAN_OPTIONS="color=always suppressions=$TRAVIS_BUILD_DIR/package/ci/leaksanitizer.conf" CORRADE_TEST_COLOR=ON ctest -V -E GLTest

1
package/ci/travis-emscripten.sh

@ -56,6 +56,7 @@ cmake .. \
-DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \
-DBUILD_TESTS=ON \ -DBUILD_TESTS=ON \
-DTARGET_GLES2=$TARGET_GLES2 -DTARGET_GLES2=$TARGET_GLES2
# Otherwise the job gets killed (probably because using too much memory)
make -j4 make -j4
# Test # Test

9
package/ci/travis.yml

@ -17,15 +17,12 @@ matrix:
compiler: gcc compiler: gcc
env: env:
- TARGET=desktop - TARGET=desktop
# Otherwise the job gets killed (probably because using too much memory)
- JOBS_LIMIT=4
- language: cpp - language: cpp
os: linux os: linux
compiler: clang compiler: clang
env: env:
- TARGET=desktop-sanitizers - TARGET=desktop-sanitizers
- CMAKE_CXX_FLAGS=-fsanitize=address - CMAKE_CXX_FLAGS=-fsanitize=address
- JOBS_LIMIT=4
addons: addons:
apt: apt:
sources: sources:
@ -42,7 +39,6 @@ matrix:
env: env:
- TARGET=desktop-gles - TARGET=desktop-gles
- TARGET_GLES2=ON - TARGET_GLES2=ON
- JOBS_LIMIT=4
# Disabled because the Ubuntu 12.04 drivers are missing some ES3 entrypoints # Disabled because the Ubuntu 12.04 drivers are missing some ES3 entrypoints
# Should be enabled after moving to 14.04 # Should be enabled after moving to 14.04
#- language: cpp #- language: cpp
@ -51,7 +47,6 @@ matrix:
#env: #env:
#- TARGET=desktop-gles #- TARGET=desktop-gles
#- TARGET_GLES2=OFF #- TARGET_GLES2=OFF
#- JOBS_LIMIT=4
- language: cpp - language: cpp
os: osx os: osx
compiler: clang compiler: clang
@ -85,8 +80,6 @@ matrix:
env: env:
- TARGET=android - TARGET=android
- TARGET_GLES2=ON - TARGET_GLES2=ON
# Otherwise the job gets killed (probably because using too much memory)
- JOBS_LIMIT=4
android: android:
components: components:
- build-tools-19.0.0 - build-tools-19.0.0
@ -97,8 +90,6 @@ matrix:
env: env:
- TARGET=android - TARGET=android
- TARGET_GLES2=OFF - TARGET_GLES2=OFF
# Otherwise the job gets killed (probably because using too much memory)
- JOBS_LIMIT=4
android: android:
components: components:
- build-tools-19.0.0 - build-tools-19.0.0

Loading…
Cancel
Save