Skip to content

Commit

Permalink
cleanup travis script a bit
Browse files Browse the repository at this point in the history
keep all the utf8 bom code together, and output the bom at the
place that it is reported
  • Loading branch information
cbeck88 committed Jul 1, 2014
1 parent 6f0ed02 commit 91510d7
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Expand Up @@ -28,16 +28,15 @@ install:
- if [ "$CHECK_UTF8" = true ]; then time sudo apt-get install -qq moreutils; fi
script:
- if [ "$CHECK_UTF8" = true ]; then time ./utils/travis/check_utf8.sh; fi
- time if grep -qorHbm1 "^`echo -ne '\xef\xbb\xbf'`" po/ src/ data/ ; then exit 1; fi
# UTF8 checks are the previous two lines. the second one checks po src data for UTF8 bom, this takes less than a second.
- time if grep -qorHbm1 "^`echo -ne '\xef\xbb\xbf'`" po/ src/ data/ ; then echo "Error: Found a UTF8 BOM:\n"; grep -orHbm1 "^`echo -ne '\xef\xbb\xbf'`" po/ src/ data/ ; exit 1; fi
# UTF8 checks are the previous two lines. the second one checks po src data for UTF8 bom, this takes a few seconds.
- scons cxxtool=$CXX --debug=time strict=$STRICT_COMPILATION $TARGETS
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- if [[ "$CPP_TESTS" = true ]]; then time ./utils/travis/test_wrapper.sh; fi
- if [[ "$WML_TESTS" = true ]]; then time ./run_wml_tests -v -t 20; 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
- if [ grep -qorHbm1 "^`echo -ne '\xef\xbb\xbf'`" po/ src/ data/ ]; then echo "Found a UTF8 BOM, see above."; fi
notifications:
email: false
irc:
Expand Down

0 comments on commit 91510d7

Please sign in to comment.