X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=regressions%2Ftest-guestfish-escapes.sh;h=73f41d5f812c2326dc7faca9112edbb754b82cb8;hp=6f4f4341655d0d2e962dc251db7bc4a6106a52a2;hb=cd1322e30d6c34d7d9f87d72dfa1660aa5d8af38;hpb=617e7f6bafa7de2303c08e1715004aae3141c389

diff --git a/regressions/test-guestfish-escapes.sh b/regressions/test-guestfish-escapes.sh
index 6f4f434..73f41d5 100755
--- a/regressions/test-guestfish-escapes.sh
+++ b/regressions/test-guestfish-escapes.sh
@@ -14,13 +14,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Test guestfish string escapes.
 
 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 ""
@@ -47,6 +47,11 @@ echo "\100"
 -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)
@@ -75,4 +80,4 @@ if [ "$(cat test.output)" != "\
     exit 1
 fi
 
-rm -f test.output test.error
+rm -f test.output test.error test.error.old