git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
java: Fix optional arguments in calls.
[libguestfs.git]
/
regressions
/
test-guestfish-escapes.sh
diff --git
a/regressions/test-guestfish-escapes.sh
b/regressions/test-guestfish-escapes.sh
index
6f4f434
..
3ba37d2
100755
(executable)
--- a/
regressions/test-guestfish-escapes.sh
+++ b/
regressions/test-guestfish-escapes.sh
@@
-20,7
+20,7
@@
set -e
set -e
-rm -f test.output test.error
+rm -f test.output test.error
test.error.old
../fish/guestfish <<'EOF' 2>test.error | od > test.output
echo ""
../fish/guestfish <<'EOF' 2>test.error | od > test.output
echo ""
@@
-47,6
+47,11
@@
echo "\100"
-echo """
EOF
-echo """
EOF
+# Since trace and debug output also goes to stderr, we must
+# remove it before testing.
+mv test.error test.error.old
+grep -v '^libguestfs: ' < test.error.old > test.error
+
if [ "$(cat test.error)" != "\
guestfish: invalid escape sequence in string (starting at offset 0)
guestfish: invalid escape sequence in string (starting at offset 0)
if [ "$(cat test.error)" != "\
guestfish: invalid escape sequence in string (starting at offset 0)
guestfish: invalid escape sequence in string (starting at offset 0)
@@
-75,4
+80,4
@@
if [ "$(cat test.output)" != "\
exit 1
fi
exit 1
fi
-rm -f test.output test.error
+rm -f test.output test.error
test.error.old