The branch, master has been updated
via f6efe0c ctdb-tests: Check for readable, not executable, script
from bccf5c9 perfcount: Fix CID 1035494 Out-of-bounds read
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f6efe0c5c2378f477e528ac9c6571a732aa2c49b
Author: Martin Schwenke <[email protected]>
Date: Fri Mar 6 11:36:18 2015 +1100
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 <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Fri Mar 6 04:40:07 CET 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
ctdb/tests/eventscripts/scripts/local.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/tests/eventscripts/scripts/local.sh
b/ctdb/tests/eventscripts/scripts/local.sh
index ed99985..219bbee 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"
--
Samba Shared Repository
