summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-01 12:45:06 +0200
committerMichael Adam <obnox@samba.org>2008-04-01 13:43:30 +0200
commitff08b55b45235067649eeefaaaf0bdc7a8166c42 (patch)
tree4182f915c6b189dbd9a2f79b7df5b140720acc52
parent8b04a3350092bf482e4b1c3339ccf95449848bf7 (diff)
downloadsamba-ff08b55b45235067649eeefaaaf0bdc7a8166c42.tar.gz
samba-ff08b55b45235067649eeefaaaf0bdc7a8166c42.tar.bz2
samba-ff08b55b45235067649eeefaaaf0bdc7a8166c42.zip
test: make registry tests more portable: use 'printf "%s"' instead of 'echo -e'
Michael (This used to be commit 5c1b7ee5c17489da90192309853aa1ecacc15512)
-rwxr-xr-xsource3/script/tests/test_net_registry.sh24
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 927882b703..42c062c21a 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -62,7 +62,7 @@ test_create_existing()
false;
fi
else
- echo -e "$OUTPUT"
+ printf "%s" "$OUTPUT"
false
fi
}
@@ -84,17 +84,17 @@ test_createkey()
if test "x$?" != "x0" ; then
echo "ERROR: failed to enumerate key '${BASEKEY}'"
echo "output:"
- echo -e "$OUTPUT"
+ printf "%s" "$OUTPUT"
false
return
fi
EXPECTED="Keyname = ${SUBKEY}"
- echo -e "$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:"
- echo -e "$OUTPUT"
+ printf "%s" "$OUTPUT"
false
fi
@@ -120,17 +120,17 @@ test_deletekey()
# check enumerate of basekey does not show key anymore:
OUTPUT=`${NETREG} enumerate ${BASEKEY}`
if test "x$?" != "x0" ; then
- echo -e "$OUTPUT"
+ printf "%s" "$OUTPUT"
false
return
fi
UNEXPECTED="Keyname = ${SUBKEY}"
- echo -e "$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:"
- echo -e "$OUTPUT"
+ printf "%s" "$OUTPUT"
false
fi
@@ -206,7 +206,7 @@ test_deletekey_with_subkey()
if test "x$?" = "x0" ; then
echo "ERROR: delete of key with subkey succeeded"
echo "output:"
- echo -e "$OUTPUT"
+ printf "%s" "$OUTPUT"
false
return
fi
@@ -238,12 +238,12 @@ test_setvalue()
if test "x$?" != "x0" ; then
echo "ERROR: failure calling enumerate for key ${KEY}"
echo output:
- echo -e "${OUTPUT}"
+ printf "%s" "${OUTPUT}"
false
return
fi
- echo -e "$OUTPUT" | {
+ printf "%s" "$OUTPUT" | {
FOUND=0
while read LINE ; do
SEARCH1=`echo $LINE | grep ^Valuename | grep ${VALNAME}`
@@ -261,7 +261,7 @@ test_setvalue()
if test "x$FOUND" != "x1" ; then
echo "ERROR: did not find value '${VALNAME}' with enumerate"
echo "enumerate output:"
- echo -e "$OUTPUT"
+ printf "%s" "$OUTPUT"
false
return
fi
@@ -301,7 +301,7 @@ test_setvalue_twice()
OUTPUT=`test_setvalue ${KEY} ${VALNAME} ${VALTYPE1} ${VALVALUE1}`
if test "x$?" != "x0" ; then
- echo -e "$OUTPUT"
+ printf "%s" "$OUTPUT"
false
return
fi