diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis-before-install.sh | 4 | ||||
| -rwxr-xr-x | scripts/travis-build.sh | 4 | ||||
| -rwxr-xr-x | scripts/travis-test.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/travis-before-install.sh b/scripts/travis-before-install.sh index ea750026..134c93bf 100755 --- a/scripts/travis-before-install.sh +++ b/scripts/travis-before-install.sh @@ -18,11 +18,11 @@ if [[ ${TRAVIS_OS_NAME} = "linux" ]]; then sudo add-apt-repository ppa:jbboehr/build-deps -y # For re2c 0.16. sudo apt-get update -qq - sudo apt-get install -qq re2c bison gcc-4.8-multilib g++-4.8-multilib -y + sudo apt-get install -qq re2c gcc-4.8-multilib g++-4.8-multilib -y sudo pip install flake8 elif [[ ${TRAVIS_OS_NAME} = "osx" ]]; then brew update - brew install re2c bison + brew install re2c else echo "unknown TRAVIS_OS_NAME: ${TRAVIS_OS_NAME}" exit 1 diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh index 24b54e25..5bb56892 100755 --- a/scripts/travis-build.sh +++ b/scripts/travis-build.sh @@ -26,8 +26,8 @@ if [[ ${TRAVIS_OS_NAME} = "linux" ]]; then fi if [[ ${COMPILER} = "gcc" ]]; then - # Build without re2c/bison to test prebuilt C sources - make gcc-debug-no-re2c-bison + # Build without re2c to test prebuilt C sources + make gcc-debug-no-re2c elif [[ ${COMPILER} = "clang" && -z ${SANITIZER:-} ]]; then # Test building without GTest submodule make clang-debug-no-tests diff --git a/scripts/travis-test.sh b/scripts/travis-test.sh index 3b7c9a13..3ce6e0b2 100755 --- a/scripts/travis-test.sh +++ b/scripts/travis-test.sh @@ -46,7 +46,7 @@ set_run_test_args() { } if [ ${CC} = "gcc" ]; then - if set_run_test_args gcc Debug no-re2c-bison; then + if set_run_test_args gcc Debug no-re2c; then run_tests fi fi |