diff options
Diffstat (limited to 'scripts/travis/run_tests.sh')
| -rwxr-xr-x | scripts/travis/run_tests.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/travis/run_tests.sh b/scripts/travis/run_tests.sh index cf47b0b97..10b145575 100755 --- a/scripts/travis/run_tests.sh +++ b/scripts/travis/run_tests.sh @@ -3,6 +3,11 @@ set -e if [ "${BUILD_TYPE}" = "integration" ]; then + # Travis has trouble with the expect tests. + if [ "${TRAVIS}" = "true" ]; then + export RUN_EXPECT="FALSE" + fi + # Run short tests when doing pull requests; leave the long testing for nightly runs. if [[ "${TRAVIS_BRANCH}" =~ ^rel/nightly ]] || [[ "${TRAVIS_BRANCH}" =~ ^hotfix/ ]]; then SHORTTEST= @@ -11,7 +16,7 @@ if [ "${BUILD_TYPE}" = "integration" ]; then fi export SHORTTEST make integration -elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ] || [[ "${TRAVIS_BRANCH}" =~ ^rel/ ]] || [[ "${TRAVIS_BRANCH}" =~ ^hotfix/ ]]; then +elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ] || [[ "${TRAVIS_BRANCH}" =~ ^rel/ ]] || [[ "${TRAVIS_BRANCH}" =~ ^hotfix/ ]]; then make fulltest -j2 else make shorttest -j2 |