diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-09-12 16:11:56 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-09-12 16:11:56 +0200 |
| commit | 41730e8cc6bc522a41f548f12e5a0ef88f2c451b (patch) | |
| tree | 4ec780571a0970456504c1915d28b143661d1f2a | |
| parent | 82c238f50455a4caf835222c3b246a4091df9310 (diff) | |
Travis add debug config
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | tools/travis-ci/run.sh | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 6fd10240..3b37fc0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ compiler: env: - OPJ_CI_ARCH=x86_64 - OPJ_CI_ARCH=i386 + - OPJ_CI_BUILD_CONFIGURATION=Release + - OPJ_CI_BUILD_CONFIGURATION=Debug matrix: exclude: @@ -15,6 +17,10 @@ matrix: compiler: gcc - compiler: clang env: OPJ_CI_ARCH=i386 + - compiler: gcc + env: OPJ_CI_BUILD_CONFIGURATION=Debug + - os: osx + env: OPJ_CI_BUILD_CONFIGURATION=Debug addons: apt: diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh index 7fdaec72..d1fae91f 100755 --- a/tools/travis-ci/run.sh +++ b/tools/travis-ci/run.sh @@ -8,7 +8,9 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true set -o pipefail ## Fail on error in pipe # Set-up some variables -OPJ_BUILD_CONFIGURATION=Release +if [ "${OPJ_CI_BUILD_CONFIGURATION:-}" == "" ]; then + export OPJ_CI_BUILD_CONFIGURATION=Release #default +fi OPJ_SOURCE_DIR=$(cd $(dirname $0)/../.. && pwd) if [ "${OPJ_DO_SUBMIT:-}" == "" ]; then @@ -79,7 +81,7 @@ OPJ_BUILDNAME=${OPJ_OS_NAME}-${OPJ_CC_VERSION}-${OPJ_CI_ARCH}-${TRAVIS_BRANCH} if [ "${TRAVIS_PULL_REQUEST:-}" != "false" ] && [ "${TRAVIS_PULL_REQUEST:-}" != "" ]; then OPJ_BUILDNAME=${OPJ_BUILDNAME}-pr${TRAVIS_PULL_REQUEST} fi -OPJ_BUILDNAME=${OPJ_BUILDNAME}-${OPJ_BUILD_CONFIGURATION}-3rdP +OPJ_BUILDNAME=${OPJ_BUILDNAME}-${OPJ_CI_BUILD_CONFIGURATION}-3rdP if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ] && [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ] && [ -d kdu ]; then echo " @@ -99,7 +101,7 @@ cmake --version export OPJ_SITE=${OPJ_SITE} export OPJ_BUILDNAME=${OPJ_BUILDNAME} export OPJ_SOURCE_DIR=${OPJ_SOURCE_DIR} -export OPJ_BUILD_CONFIGURATION=${OPJ_BUILD_CONFIGURATION} +export OPJ_BUILD_CONFIGURATION=${OPJ_CI_BUILD_CONFIGURATION} export OPJ_DO_SUBMIT=${OPJ_DO_SUBMIT} ctest -S ${OPJ_SOURCE_DIR}/tools/ctest_scripts/travis-ci.cmake -V |