ctdb-tests: Check for readable, not executable, script
authorMartin Schwenke <martin@meltin.net>
Fri, 6 Mar 2015 00:36:18 +0000 (11:36 +1100)
committerAmitay Isaacs <amitay@samba.org>
Fri, 6 Mar 2015 03:40:07 +0000 (04:40 +0100)
Scripts in eventscript unit tests are run under an explicitly
specified shell so they do not need to be executable.  Checking that
the script is executable breaks on scripts that are installed without
the execute bit set, such as disabled eventscripts.

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): Fri Mar  6 04:40:07 CET 2015 on sn-devel-104

ctdb/tests/eventscripts/scripts/local.sh

index ed99985b8e38305e75baa00e14c37e1d5c95c273..219bbee51c9641f542accf2273a43c5ca9ad0c06 100644 (file)
@@ -1099,7 +1099,7 @@ define_test ()
            script_dir="${CTDB_BASE}"
     esac
 
-    [ -x "${script_dir}/${script}" ] || \
+    [ -r "${script_dir}/${script}" ] || \
        die "Internal error - unable to find script \"${script_dir}/${script}\""
 
     printf "%-17s %-10s %-4s - %s\n\n" "$script" "$event" "$_num" "$desc"