From 1b56179676edb6f9d0064ea85aed323630cf3ba0 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sat, 23 Aug 2014 16:02:04 +0400 Subject: [PATCH] Disable dash tests in travis --- tests/test_shells/test.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh index f495708b..64f9146f 100755 --- a/tests/test_shells/test.sh +++ b/tests/test_shells/test.sh @@ -301,6 +301,10 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te fi fi SH="${TEST_COMMAND%% *}" + # dash tests are not stable, see #931 + if test x$FAST$SH = x1dash ; then + continue + fi if test "x$ONLY_SHELL" != "x" && test "x$ONLY_SHELL" != "x$SH" ; then continue fi @@ -309,10 +313,7 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te fi echo ">>> $(which $SH)" if ! run_test $TEST_TYPE $TEST_CLIENT $TEST_COMMAND ; then - # dash tests are not stable, see #931 - if test "x$SH" != "xdash" ; then - FAILED=1 - fi + FAILED=1 fi done done