From: Michael Adam Date: Tue, 1 Apr 2008 10:48:25 +0000 (+0200) Subject: test: make registry tests more portable: protect some grep patterns in ' '. X-Git-Tag: samba-3.3.0pre1~2973 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cb3b2f065566f981f6cfb8b5efdfad7db49c719;p=thirdparty%2Fsamba.git test: make registry tests more portable: protect some grep patterns in ' '. Michael --- diff --git a/source/script/tests/test_net_registry.sh b/source/script/tests/test_net_registry.sh index 42c062c21a5..fd9275a6d95 100755 --- a/source/script/tests/test_net_registry.sh +++ b/source/script/tests/test_net_registry.sh @@ -90,7 +90,7 @@ test_createkey() fi EXPECTED="Keyname = ${SUBKEY}" - printf "%s" "$OUTPUT" | grep ^Keyname | grep ${SUBKEY} + printf "%s" "$OUTPUT" | grep '^Keyname' | grep ${SUBKEY} if test "x$?" != "x0" ; then echo "ERROR: did not find expexted '$EXPECTED' in output" echo "output:" @@ -126,7 +126,7 @@ test_deletekey() fi UNEXPECTED="Keyname = ${SUBKEY}" - printf "%s" "$OUTPUT" | grep ^Keyname | grep ${SUBKEY} + printf "%s" "$OUTPUT" | 'grep ^Keyname' | grep ${SUBKEY} if test "x$?" = "x0" ; then echo "ERROR: found '$UNEXPECTED' after delete in output" echo "output:" @@ -246,11 +246,11 @@ test_setvalue() printf "%s" "$OUTPUT" | { FOUND=0 while read LINE ; do - SEARCH1=`echo $LINE | grep ^Valuename | grep ${VALNAME}` + SEARCH1=`echo $LINE | grep '^Valuename' | grep ${VALNAME}` if test "x$?" = "x0" ; then read LINE read LINE - SEARCH2=`echo $LINE | grep "^Value " | grep ${VALVALUE}` + SEARCH2=`echo $LINE | grep '^Value ' | grep ${VALVALUE}` if test "x$?" = "x0" ; then FOUND=1 break