diff options
| author | Martin Schwenke <martin@meltin.net> | 2009-05-01 17:40:45 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-05-12 14:44:30 +1000 |
| commit | 7c7c5b3489f97154b2d25cefafb55e04c8846c5d (patch) | |
| tree | 6314cecc7951db5efa757026e0691fa64c4eaed7 /ctdb/tests/scripts/test_wrap | |
| parent | 0dfc35641f19fb2dbe97aea7bd9fe7efcd42f11a (diff) | |
| download | samba-7c7c5b3489f97154b2d25cefafb55e04c8846c5d.tar.gz samba-7c7c5b3489f97154b2d25cefafb55e04c8846c5d.tar.xz samba-7c7c5b3489f97154b2d25cefafb55e04c8846c5d.zip | |
Bug fixes for tests: simple/12_ctdb_getdebug.sh and scripts/test_wrap.
simple/12_ctdb_getdebug.sh now recognises output with multi-digit node
numbers.
Sharing the ctdb directory via NFS and testing on a real cluster by
setting CTDB_TEST_REAL_CLUSTER didn't work by default. The fix is to
hack scripts/test_wrap so that it tries to find a valid bin directory
next to the directory containing it is in.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit ea2ca769e1d1068fbbad843750b19acfd87360e0)
Diffstat (limited to 'ctdb/tests/scripts/test_wrap')
| -rwxr-xr-x | ctdb/tests/scripts/test_wrap | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ctdb/tests/scripts/test_wrap b/ctdb/tests/scripts/test_wrap index 35ad41830f..6c730ef768 100755 --- a/ctdb/tests/scripts/test_wrap +++ b/ctdb/tests/scripts/test_wrap @@ -5,6 +5,12 @@ PATH="$(dirname $0):${PATH}" +f="ctdb_bench" +if [ ! $(which $f >/dev/null 2>&1) ] ; then + d=$(dirname $(dirname $0))/bin + [ -x "$d/$f" ] && PATH="$d:$PATH" +fi + . ctdb_test_functions.bash "$@" |