diff options
| author | Michael Adam <obnox@samba.org> | 2008-04-01 15:19:05 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-04-01 16:16:55 +0200 |
| commit | a63c396679f557875e9a949f50c0c1463548cb2b (patch) | |
| tree | 6e98095610aac647010dc56c5d75121540709d80 /source3/script | |
| parent | dffcb461fbd7130c2049832916c315657ec12084 (diff) | |
| download | samba-a63c396679f557875e9a949f50c0c1463548cb2b.tar.gz samba-a63c396679f557875e9a949f50c0c1463548cb2b.tar.bz2 samba-a63c396679f557875e9a949f50c0c1463548cb2b.zip | |
test: fix use of printf in net_registry tests.
actually 'printf "%s\n"' is the proper replacement of 'echo -e'
Michael
(This used to be commit 388a40931f1559b134317ef0c85c7cf2598e17fe)
Diffstat (limited to 'source3/script')
| -rwxr-xr-x | source3/script/tests/test_net_registry.sh | 24 |
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 fd9275a6d9..4c6dd19100 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 - printf "%s" "$OUTPUT" + printf "%s\n" "$OUTPUT" false fi } @@ -84,17 +84,17 @@ test_createkey() if test "x$?" != "x0" ; then echo "ERROR: failed to enumerate key '${BASEKEY}'" echo "output:" - printf "%s" "$OUTPUT" + printf "%s\n" "$OUTPUT" false return fi EXPECTED="Keyname = ${SUBKEY}" - printf "%s" "$OUTPUT" | grep '^Keyname' | grep ${SUBKEY} + printf "%s\n" "$OUTPUT" | grep '^Keyname' | grep ${SUBKEY} if test "x$?" != "x0" ; then echo "ERROR: did not find expexted '$EXPECTED' in output" echo "output:" - printf "%s" "$OUTPUT" + printf "%s\n" "$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 - printf "%s" "$OUTPUT" + printf "%s\n" "$OUTPUT" false return fi UNEXPECTED="Keyname = ${SUBKEY}" - printf "%s" "$OUTPUT" | 'grep ^Keyname' | grep ${SUBKEY} + printf "%s\n" "$OUTPUT" | 'grep ^Keyname' | grep ${SUBKEY} if test "x$?" = "x0" ; then echo "ERROR: found '$UNEXPECTED' after delete in output" echo "output:" - printf "%s" "$OUTPUT" + printf "%s\n" "$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:" - printf "%s" "$OUTPUT" + printf "%s\n" "$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: - printf "%s" "${OUTPUT}" + printf "%s\n" "${OUTPUT}" false return fi - printf "%s" "$OUTPUT" | { + printf "%s\n" "$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:" - printf "%s" "$OUTPUT" + printf "%s\n" "$OUTPUT" false return fi @@ -301,7 +301,7 @@ test_setvalue_twice() OUTPUT=`test_setvalue ${KEY} ${VALNAME} ${VALTYPE1} ${VALVALUE1}` if test "x$?" != "x0" ; then - printf "%s" "$OUTPUT" + printf "%s\n" "$OUTPUT" false return fi |