summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-02-26 11:03:31 +0100
committerJean Delvare <jdelvare@suse.de>2014-02-26 11:03:31 +0100
commite5a039d3f818dcae7533c8effe8517894afd1bb3 (patch)
tree6ab033ee6cf5b919671904d4ac87f527b7c25a9e /test
parent3a7155802f24f9d07405014d258b215680e5176e (diff)
downloadquilt-e5a039d3f818dcae7533c8effe8517894afd1bb3.tar.gz
test/setup: Fix for GNU patch version <= 2.5.9
Recent versions of GNU diff will quote file names which include a space, but GNU patch version 2.5.9 and older do not support that. So strip the quotes to let the test succeed.
Diffstat (limited to 'test')
-rw-r--r--test/setup.test8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/setup.test b/test/setup.test
index 19c3c2d..5a39475 100644
--- a/test/setup.test
+++ b/test/setup.test
@@ -93,9 +93,11 @@ $ rm -rf "dir"
$ mkdir "space [dir]"
$ echo 1 > "space [dir]/foo.orig"
$ echo 2 > "space [dir]/foo"
-$ diff -u "space [dir]/foo.orig" "space [dir]/foo" > foo.diff
-$ diff -u "space [dir]/foo.orig" "space [dir]/foo" > revert.diff
-$ diff -u "space [dir]/foo.orig" "space [dir]/foo" > again.diff
+# Recent versions of GNU diff will quote such file names, but old versions
+# of GNU patch do not support that, so strip the quotes
+$ diff -u "space [dir]/foo.orig" "space [dir]/foo" | sed -e 's:"::g' > foo.diff
+$ cp foo.diff revert.diff
+$ cp foo.diff again.diff
$ mv "space [dir]/foo.orig" "space [dir]/foo"
$ tar cf - "space [dir]" | gzip > "space [dir].tar.gz"
$ rm -rf "space [dir]"