forked from pool/quilt
27 lines
894 B
Diff
27 lines
894 B
Diff
|
From: Jean Delvare <jdelvare@suse.de>
|
||
|
|
Subject: faildiff.test: Fix for diffutils 3.4 and later
|
||
|
|
|
||
|
|
Since diffutils version 3.4, diff no longer returns an error code for
|
||
|
|
binary files. Remove this test from faildiff.test.
|
||
|
|
|
||
|
|
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||
|
|
---
|
||
|
|
test/faildiff.test | 9 ++-------
|
||
|
|
1 file changed, 2 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
--- quilt.orig/test/faildiff.test 2016-09-09 10:16:05.709530299 +0200
|
||
|
|
+++ quilt/test/faildiff.test 2016-09-09 10:39:16.914180640 +0200
|
||
|
|
@@ -29,10 +29,5 @@ What happens on binary files?
|
||
|
|
$ printf "\\003\\000\\001" > test.bin
|
||
|
|
$ quilt diff -pab --no-index
|
||
|
|
>~ (Files|Binary files) a/test\.bin and b/test\.bin differ
|
||
|
|
- $ echo %{?}
|
||
|
|
- > 1
|
||
|
|
-
|
||
|
|
- $ quilt refresh
|
||
|
|
- > Diff failed on file 'test.bin', aborting
|
||
|
|
- $ echo %{?}
|
||
|
|
- > 1
|
||
|
|
+ # Since diffutils version 3.4, diff no longer returns an error
|
||
|
|
+ # code for binary files, so we don't test it here.
|