From: Luca Heltai Date: Mon, 25 Aug 2014 14:28:01 +0000 (+0200) Subject: Removed all builds. Only indent test. X-Git-Tag: v8.2.0-rc1~175^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfdab4be4613d4999bc07a1f29ea68a9ba889d9f;p=dealii.git Removed all builds. Only indent test. --- diff --git a/.travis.yml b/.travis.yml index f8ba47b8ea..e069ae5507 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,10 @@ language: C++ -before_install: ./contrib/utilities/setup_travis.sh - -os: -- linux -- mac - compiler: -- clang - gcc -script: ./contrib/utilities/run_travis.sh $CI_TEST_SUITE $CI_BUILD_TYPE +script: ./contrib/utilities/run_travis.sh branches: only: - master - -env: -# This is way too long. We should find a way to do this in little pieces... -# - CI_TEST_SUITE=tests - -# These tests run ok, but they might be out of policy... - - CI_TEST_SUITE=build CI_BUILD_TYPE=Debug - - CI_TEST_SUITE=indent -# - CI_TEST_SUITE=build CI_BUILD_TYPE=Release - -# These tests only compile and run "make tests" -# - CI_TEST_SUITE=mini CI_BUILD_TYPE=Debug -# - CI_TEST_SUITE=mini CI_BUILD_TYPE=Release diff --git a/contrib/utilities/run_travis.sh b/contrib/utilities/run_travis.sh index 5d9ac76215..a6b2ca58ca 100755 --- a/contrib/utilities/run_travis.sh +++ b/contrib/utilities/run_travis.sh @@ -1,32 +1,17 @@ #!/bin/sh -case $1 in -build) - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - echo "Running build tests." - mkdir build_test - cd build_test - ctest -DCMAKE_BUILD_TYPE=$2 -V -j4 -S ../tests/run_buildtest.cmake - else - echo "Build test is only run when merging to master branch. Exiting." - fi - ;; -indent) - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then + +if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then echo "Running indentation test on master merge." - else - echo "Running indentation test on Pull Request #${TRAVIS_PULL_REQUEST}" - fi - wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.04/astyle_2.04_linux.tar.gz > /dev/null - tar xvfz astyle_2.04_linux.tar.gz > /dev/null - pushd astyle/build/gcc - make -j4 > /dev/null - popd - export PATH=`pwd`/astyle/build/gcc/bin:$PATH - ./contrib/utilities/indent - git diff-files --quiet || (git diff && failing_missing_command) - ;; -*) - echo "Unrecognized test type! [$1]" - exit 1 -esac +else + echo "Running indentation test on Pull Request #${TRAVIS_PULL_REQUEST}" +fi +wget http://downloads.sourceforge.net/project/astyle/astyle/astyle%202.04/astyle_2.04_linux.tar.gz > /dev/null +tar xvfz astyle_2.04_linux.tar.gz > /dev/null +cd astyle/build/gcc +make -j4 > /dev/null +cd ../../../ +export PATH=`pwd`/astyle/build/gcc/bin:$PATH +./contrib/utilities/indent +git diff +git diff-files --quiet diff --git a/contrib/utilities/setup_travis.sh b/contrib/utilities/setup_travis.sh deleted file mode 100755 index ec39454533..0000000000 --- a/contrib/utilities/setup_travis.sh +++ /dev/null @@ -1,17 +0,0 @@ -#/bin/sh -f - -# things to do for travis-ci in the before_install section - -if ( test "`uname -s`" = "Darwin" ) -then - #cmake v2.8.12 is installed on the Mac workers now - #brew update - #brew install cmake - echo -else - #install a newer cmake since at this time Travis only has version 2.8.7 - sudo apt-get install build-essential - echo "yes" | sudo add-apt-repository ppa:kalakris/cmake - sudo apt-get update -qq - sudo apt-get install cmake -fi