Skip to content

Commit

Permalink
travis: remove "time" utility, travis has a new feature for this
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeck88 committed Dec 28, 2014
1 parent 6695365 commit 826c447
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Expand Up @@ -51,10 +51,10 @@ install:
- sudo apt-get install -qq libboost-filesystem-dev libboost-iostreams-dev libboost-random-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libboost-locale-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb moreutils
- if [ "$CXX" = "g++" ]; then sudo apt-get -qq install g++-4.8; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
# - if [ "$CPP_TESTS" = true ]; then time sudo update-alternatives --remove postmaster.1.gz /usr/share/postgresql/9.1/man/man1/postmaster.1.gz; fi
# - if [ "$CPP_TESTS" = true ]; then time sudo apt-get -f; fi
# - if [ "$CPP_TESTS" = true ]; then time sudo apt-get install --reinstall postgresql-9.1; fi
# - if [ "$CPP_TESTS" = true ]; then time sudo apt-get -o Dpkg::Options::='--force-confold' --force-yes -fuy upgrade; fi
# - if [ "$CPP_TESTS" = true ]; then sudo update-alternatives --remove postmaster.1.gz /usr/share/postgresql/9.1/man/man1/postmaster.1.gz; fi
# - if [ "$CPP_TESTS" = true ]; then sudo apt-get -f; fi
# - if [ "$CPP_TESTS" = true ]; then sudo apt-get install --reinstall postgresql-9.1; fi
# - if [ "$CPP_TESTS" = true ]; then sudo apt-get -o Dpkg::Options::='--force-confold' --force-yes -fuy upgrade; fi
- $CXX -v

script:
Expand All @@ -66,9 +66,9 @@ script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- if [ "$CPP_TESTS" = true ]; then ./utils/travis/test_wrapper.sh; fi
- if [ "$WML_TESTS" = true ]; then time ./run_wml_tests -g -v -c -t "$WML_TEST_TIME"; fi
- if [ "$PLAY_TEST" = true ]; then time ./utils/travis/play_test_executor.sh; fi
- if [ "$MP_TEST" = true ]; then time ./utils/travis/mp_test_executor.sh; fi
- if [ "$WML_TESTS" = true ]; then ./run_wml_tests -g -v -c -t "$WML_TEST_TIME"; fi
- if [ "$PLAY_TEST" = true ]; then ./utils/travis/play_test_executor.sh; fi
- if [ "$MP_TEST" = true ]; then ./utils/travis/mp_test_executor.sh; fi

after_failure:
- if [ -f "errors.log" ]; then echo -e "\n*** \n*\n* Errors reported in wml unit tests, here is errors.log...\n*\n*** \n"; cat errors.log; fi
Expand Down

0 comments on commit 826c447

Please sign in to comment.