From: Martin Schwenke <martin@meltin.net>
Date: Fri, 18 May 2018 01:44:11 +0000 (+1000)
Subject: ctdb-tests: Continue running if a testcase is not executable
X-Git-Tag: tevent-0.9.37~422
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2e8ab3f02aab7e2550409762800befa4b55cb69;p=thirdparty%2Fsamba.git

ctdb-tests: Continue running if a testcase is not executable

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Tue Jun  5 20:37:15 CEST 2018 on sn-devel-144
---

diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index 3649d76e34e..f1268a5f404 100755
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -142,7 +142,12 @@ ctdb_test_run ()
     $no_header || ctdb_test_begin "$name"
 
     local status=0
-    timeout $TEST_TIMEOUT "$@" || status=$?
+    if [ -x "$1" ] ; then
+	    timeout $TEST_TIMEOUT "$@" || status=$?
+    else
+	    echo "TEST IS NOT EXECUTABLE"
+	    status=1
+    fi
 
     $no_header || ctdb_test_end "$name" "$status" "$*"
 
@@ -186,7 +191,6 @@ run_one_test ()
 {
     local f="$1"
 
-    [ -x "$f" ] || die "test \"$f\" is not executable"
     tests_total=$(($tests_total + 1))
 
     ctdb_test_run "$f" | tee "$tf" | show_progress