From c3a88eb8ea6098077b9b4c39d7d8c2b62daf7c5d Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 14 Mar 2014 08:29:47 -0300 Subject: Remove remaining hangul-related code --- scripts/travis.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'scripts/travis.sh') diff --git a/scripts/travis.sh b/scripts/travis.sh index fb5a770863..8b79930aa0 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -1,15 +1,19 @@ #!/bin/sh -e check_and_report() { - reset ( cd $tmpdir - if [ -f asan.* ] || [ -f tsan.* ] || [ -f ubsan.* ]; then - cat $tmpdir/asan.* 2> /dev/null || true - cat $tmpdir/tsan.* 2> /dev/null || true - cat $tmpdir/ubsan.* 2> /dev/null || true - exit 1 - fi + set -- [*]san.[*] *san.* + case $1$2 in + '[*]san.[*]*san.*') + ;; + *) + shift + cat "$@" + echo "Runtime errors detected" + exit 1 + ;; + esac ) } @@ -36,6 +40,7 @@ if [ "$CC" = "clang" ]; then make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$install_dir" make if ! make test; then + reset check_and_report fi check_and_report -- cgit