summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-01 12:48:25 +0200
committerMichael Adam <obnox@samba.org>2008-04-01 13:43:30 +0200
commit41281d3525e70f37aa7f61ef1f8ba90f5557de9a (patch)
treec892e2cf21b9b2009fb3e2950dc5f9e01cbdd99e
parentff08b55b45235067649eeefaaaf0bdc7a8166c42 (diff)
downloadsamba-41281d3525e70f37aa7f61ef1f8ba90f5557de9a.tar.gz
samba-41281d3525e70f37aa7f61ef1f8ba90f5557de9a.tar.bz2
samba-41281d3525e70f37aa7f61ef1f8ba90f5557de9a.zip
test: make registry tests more portable: protect some grep patterns in ' '.
Michael (This used to be commit 1cb3b2f065566f981f6cfb8b5efdfad7db49c719)
-rwxr-xr-xsource3/script/tests/test_net_registry.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 42c062c21a..fd9275a6d9 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/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