From f6efe0c5c2378f477e528ac9c6571a732aa2c49b Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 6 Mar 2015 11:36:18 +1100 Subject: ctdb-tests: Check for readable, not executable, script 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 Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Fri Mar 6 04:40:07 CET 2015 on sn-devel-104 --- ctdb/tests/eventscripts/scripts/local.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index ed99985b8e..219bbee51c 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -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" -- cgit