diff --git a/.travis.osx.yml b/.travis.osx.yml index 6bb0b0e92..6180249ec 100644 --- a/.travis.osx.yml +++ b/.travis.osx.yml @@ -6,7 +6,7 @@ env: - CMAKE_CXX_COMPILER=g++ CMAKE_BUILD_TYPE=DEBUG USE_TCMALLOC=TRUE PUSH_TO_CDASH=TRUE - CMAKE_CXX_COMPILER=g++ CMAKE_BUILD_TYPE=DEBUG USE_TCMALLOC=FALSE - CMAKE_CXX_COMPILER=g++ CMAKE_BUILD_TYPE=RELEASE USE_TCMALLOC=TRUE UPLOAD=osx - - CMAKE_CXX_COMPILER=g++ CMAKE_BUILD_TYPE=RELEASE USE_TCMALLOC=FALSE UPLOAD=osx_tcmalloc + - CMAKE_CXX_COMPILER=g++ CMAKE_BUILD_TYPE=RELEASE USE_TCMALLOC=FALSE UPLOAD=osx_tcmalloc PUSH_TO_CDASH=TRUE before_script: - mkdir -p build @@ -20,7 +20,20 @@ before_script: script: - cd build +- SITE=OSX10.8.2@Travis +- GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1` +- if [[ $CMAKE_BUILD_TYPE == RELEASE ]]; then + BUILD_TYPE=Release; + else + BUILD_TYPE=Debug; + fi +- BUILD_NAME=${TRAVIS_BRANCH}_${GIT_COMMIT}_g++-4.9.0_${BUILD_TYPE} +- CONFIG_FILE=DartConfiguration.tcl +- sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE +- sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE - ctest -D ExperimentalConfigure +- sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE +- sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE - ctest -D ExperimentalBuild -VV - yes "C" | ctest -D ExperimentalTest -VV - cd .. diff --git a/.travis.windows.yml b/.travis.windows.yml index ef507f923..75bed7373 100644 --- a/.travis.windows.yml +++ b/.travis.windows.yml @@ -6,7 +6,7 @@ env: - secure: "H1aUwvee839ZPVievqm8Fwl9hBHx5/JW6+J66+ORYL2IHHPjfOgLKRYU2rcTcbxnZO88NJRGeiI431rEadBU2Ie5aS8WpKM5orvRmdd6bLcCvzqN+hS8JCmCVygQtgpKYYUk8iDWhX9YCgPVs0RlRz3UCjwUpqdkmL+w74lIZMM=" matrix: - CMAKE_CXX_COMPILER=g++ CMAKE_BUILD_TYPE=RELEASE UPLOAD=windows DROPBOX=TRUE PUSH_TO_CDASH=TRUE - - CMAKE_CXX_COMPILER=g++ CMAKE_BUILD_TYPE=DEBUG + - CMAKE_CXX_COMPILER=g++ CMAKE_BUILD_TYPE=DEBUG PUSH_TO_CDASH=TRUE install: - sudo add-apt-repository --yes ppa:purplekarrot/cmake @@ -27,10 +27,23 @@ script: - LEAN_ROOT=`pwd` - cd build - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ../src -DCMAKE_TOOLCHAIN_FILE=/tmp/mxe/usr/x86_64-w64-mingw32/share/cmake/mxe-conf.cmake + - SITE=Windows@Travis + - GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1` + - if [[ $CMAKE_BUILD_TYPE == RELEASE ]]; then + BUILD_TYPE=Release; + else + BUILD_TYPE=Debug; + fi + - BUILD_NAME=${TRAVIS_BRANCH}_${GIT_COMMIT}_w64-mingw32-g++-4.8.1_${BUILD_TYPE} + - CONFIG_FILE=DartConfiguration.tcl + - sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE + - sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE - ctest -D ExperimentalConfigure + - sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE + - sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE - ctest -D ExperimentalBuild -VV - if [[ $PUSH_TO_CDASH == TRUE ]]; then - find Testing -type f -exec sed -i 's/OSName=\"Linux\"/OSName=\"Windows\"/g' {} \; ; + find Testing -type f -name "*.xml" -exec sed -i 's/OSName=\"Linux\"/OSName=\"Windows\"/' {} \; ; ctest -D ExperimentalSubmit; fi - cd .. diff --git a/.travis.yml b/.travis.yml index 049484460..b52beffa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,11 +37,13 @@ env: - CMAKE_CXX_COMPILER=clang++-3.3 CMAKE_BUILD_TYPE=RELEASE USE_TCMALLOC=TRUE + PUSH_TO_CDASH=TRUE - CMAKE_CXX_COMPILER=g++-4.8 CMAKE_BUILD_TYPE=RELEASE USE_TCMALLOC=TRUE DROPBOX=TRUE UPLOAD=linux_tcmalloc + PUSH_TO_CDASH=TRUE - CMAKE_CXX_COMPILER=clang++-3.3 CMAKE_BUILD_TYPE=DEBUG USE_TCMALLOC=FALSE @@ -89,7 +91,20 @@ script: - cd build - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ../src - if [[ $CMAKE_BUILD_TYPE == DEBUG || $CMAKE_BUILD_TYPE == RELEASE || $CMAKE_BUILD_TYPE == TESTCOV ]]; then + SITE=Ubuntu12.04@Travis; + GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`; + if [[ $CMAKE_BUILD_TYPE == RELEASE ]]; then + BUILD_TYPE=Release; + else + BUILD_TYPE=Debug; + fi; + BUILD_NAME=${TRAVIS_BRANCH}_${GIT_COMMIT}_${CMAKE_CXX_COMPILER}_${BUILD_TYPE}; + CONFIG_FILE=DartConfiguration.tcl; + sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE; + sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE; ctest -D ExperimentalConfigure; + sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE; + sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE; ctest -D ExperimentalBuild -VV; yes "C" | ctest -D ExperimentalTest -VV; fi