test-mq on FreeBSD

Adrian Buehlmann adrian at cadifra.com
Wed May 28 12:59:02 UTC 2008


Just a minor point. When running the testsuite on FreeBSD 6.2, I always get:

ERROR: test-mq output changed
--- Expected output
+++ Test output
@@ -499,7 +499,7 @@
 abort: local changes found, refresh first
 % apply force, should not discard changes with empty patch
 applying empty
-/usr/bin/patch: **** Only garbage was found in the patch input.
+patch: **** Only garbage was found in the patch input.
 patch failed, unable to continue (try -v)
 patch empty is empty
 Now at: empty

Could we agree on using that output on all unixes by doing
the patch below?

diff -r 5868d0b8509f tests/test-mq
--- a/tests/test-mq     Sun May 25 13:39:08 2008 -0700
+++ b/tests/test-mq     Wed May 28 14:49:49 2008 +0200
@@ -520,7 +520,7 @@
 hg qpush

 echo % apply force, should not discard changes with empty patch
-hg qpush -f
+hg qpush -f 2>&1 | sed 's/\/usr\/bin\/patch:/patch:/'
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True
 hg log -l1 -p
diff -r 5868d0b8509f tests/test-mq.out
--- a/tests/test-mq.out Sun May 25 13:39:08 2008 -0700
+++ b/tests/test-mq.out Wed May 28 14:49:49 2008 +0200
@@ -499,7 +499,7 @@
 abort: local changes found, refresh first
 % apply force, should not discard changes with empty patch
 applying empty
-/usr/bin/patch: **** Only garbage was found in the patch input.
+patch: **** Only garbage was found in the patch input.
 patch failed, unable to continue (try -v)
 patch empty is empty
 Now at: empty






More information about the Mercurial-devel mailing list