[SCM] CTDB repository - branch master updated - ctdb-1.0.81-10-gea2ca76

[Ronnie Sahlberg]

The branch, master has been updated
       via  ea2ca769e1d1068fbbad843750b19acfd87360e0 (commit)
      from  1c31fea7432b870169fb839c1fbba5a33dec8e8a (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ea2ca769e1d1068fbbad843750b19acfd87360e0
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri May 1 17:40:45 2009 +1000

    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 at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 tests/scripts/test_wrap          |    6 ++++++
 tests/simple/12_ctdb_getdebug.sh |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/scripts/test_wrap b/tests/scripts/test_wrap
index 35ad418..6c730ef 100755
--- a/tests/scripts/test_wrap
+++ b/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
 
 "$@"
diff --git a/tests/simple/12_ctdb_getdebug.sh b/tests/simple/12_ctdb_getdebug.sh
index 2f4eefd..5c74bc8 100755
--- a/tests/simple/12_ctdb_getdebug.sh
+++ b/tests/simple/12_ctdb_getdebug.sh
@@ -38,7 +38,7 @@ getdebug_onnode="$out"
 
 sanity_check_output \
     $num_nodes \
-    '^Node [[:digit:]] is at debug level [[:alpha:]]+ \([[:digit:]]\)$' \
+    '^Node [[:digit:]]+ is at debug level [[:alpha:]]+ \([[:digit:]]\)$' \
     "$out"
 
 try_command_on_node -v 1 "$CTDB getdebug -n all"
@@ -65,7 +65,7 @@ colons=""
 nl="
 "
 while read line ; do
-    t=$(echo "$line" | sed -r -e 's at Node [[:digit:]] is at debug level ([[:alpha:]]+) \((-?[[:digit:]])\)$@:\1:\2:@')
+    t=$(echo "$line" | sed -r -e 's at Node [[:digit:]]+ is at debug level ([[:alpha:]]+) \((-?[[:digit:]])\)$@:\1:\2:@')
     colons="${colons}${colons:+${nl}}:Name:Level:${nl}${t}"
 done <<<"$getdebug_onnode"
 


-- 
CTDB repository