Travis add debug config

diff --git a/.travis.yml b/.travis.yml
index 6fd10240ffb1c1f14ebd54679006dd15902faf5c..3b37fc0e3f9da7c6812d6c7c8689cda6cffabdb4 100644 (file)
--- 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 7fdaec726999e6bc953d8e3bb824d23f54b136f7..d1fae91fbc9079c947868ef2460ef518e60fa836 100755 (executable)
--- 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