summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-10 19:29:39 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-10 19:29:39 +0300
commit6524f86be0e1d05ac27a3cb64b163713304d30d8 (patch)
tree09aa0d21dddf312418b70f371da313b9588e472b
parent556e081363da7255fd8c0fea65aeab887b6aa5f8 (diff)
downloadplus-6524f86be0e1d05ac27a3cb64b163713304d30d8.tar.gz
plus-6524f86be0e1d05ac27a3cb64b163713304d30d8.tar.bz2
plus-6524f86be0e1d05ac27a3cb64b163713304d30d8.tar.xz
plus-6524f86be0e1d05ac27a3cb64b163713304d30d8.zip
Improve error checks in tests ci scripts.
-rwxr-xr-xtools/ci/jobs/gcc5_sanitize_tests.sh2
-rwxr-xr-xtools/ci/jobs/gcc5_sdl2_tests.sh2
-rwxr-xr-xtools/ci/jobs/gcc5_tests.sh2
-rwxr-xr-xtools/ci/jobs/gcc6_tests.sh2
-rwxr-xr-xtools/ci/scripts/init.sh12
5 files changed, 16 insertions, 4 deletions
diff --git a/tools/ci/jobs/gcc5_sanitize_tests.sh b/tools/ci/jobs/gcc5_sanitize_tests.sh
index 18e29e7ad..05f1a93f0 100755
--- a/tools/ci/jobs/gcc5_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc5_sanitize_tests.sh
@@ -57,7 +57,7 @@ do_init
run_configure --enable-unittests=yes
export SDL_VIDEODRIVER=dummy
export ASAN_OPTIONS=detect_leaks=0
-run_make check
+run_make_check
source ./tools/ci/scripts/exit.sh
diff --git a/tools/ci/jobs/gcc5_sdl2_tests.sh b/tools/ci/jobs/gcc5_sdl2_tests.sh
index 36bce38cd..cf38a9e60 100755
--- a/tools/ci/jobs/gcc5_sdl2_tests.sh
+++ b/tools/ci/jobs/gcc5_sdl2_tests.sh
@@ -47,7 +47,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
do_init
run_configure --with-sdl2 --enable-unittests=yes
export SDL_VIDEODRIVER=dummy
-run_make check
+run_make_check
source ./tools/ci/scripts/exit.sh
diff --git a/tools/ci/jobs/gcc5_tests.sh b/tools/ci/jobs/gcc5_tests.sh
index c0cf89176..e21b2b33c 100755
--- a/tools/ci/jobs/gcc5_tests.sh
+++ b/tools/ci/jobs/gcc5_tests.sh
@@ -47,7 +47,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
do_init
run_configure --enable-unittests=yes
export SDL_VIDEODRIVER=dummy
-run_make check
+run_make_check
source ./tools/ci/scripts/exit.sh
diff --git a/tools/ci/jobs/gcc6_tests.sh b/tools/ci/jobs/gcc6_tests.sh
index e9a315db6..b93d56a6b 100755
--- a/tools/ci/jobs/gcc6_tests.sh
+++ b/tools/ci/jobs/gcc6_tests.sh
@@ -20,7 +20,7 @@ source ./tools/ci/flags/gcc6.sh
do_init
run_configure --enable-unittests=yes
export SDL_VIDEODRIVER=dummy
-run_make check
+run_make_check
source ./tools/ci/scripts/exit.sh
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index 7f48bb0aa..ad086d705 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -146,6 +146,18 @@ function run_make {
check_error $?
}
+function run_make_check {
+ rm $ERRFILE
+ echo "make -j2 V=0 check $*"
+ make -j2 V=0 check $* 2>$ERRFILE
+ export ERR=$?
+ if [ "${ERR}" != 0 ]; then
+ cat $ERRFILE
+ cat src/manaplustests.log
+ exit ${ERR}
+ fi
+}
+
function run_check_warnings {
DATA=$(cat $ERRFILE)
if [ "$DATA" != "" ];