test: make registry tests more portable: protect some grep patterns in ' '.
authorMichael Adam <obnox@samba.org>
Tue, 1 Apr 2008 10:48:25 +0000 (12:48 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 1 Apr 2008 11:43:30 +0000 (13:43 +0200)
Michael
(This used to be commit 1cb3b2f065566f981f6cfb8b5efdfad7db49c719)

source3/script/tests/test_net_registry.sh

index 42c062c21a5250350c9af565930a04d062b14408..fd9275a6d95f77f4795cf5eeac62b1b76c8ad72c 100755 (executable)
@@ -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