quilt-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Quilt-dev] [PATCH] faildiff.test: Fix for diffutils 3.4 and later


From: Jean Delvare
Subject: [Quilt-dev] [PATCH] faildiff.test: Fix for diffutils 3.4 and later
Date: Fri, 9 Sep 2016 10:56:58 +0200

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 <address@hidden>
---
 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.


-- 
Jean Delvare
SUSE L3 Support



reply via email to

[Prev in Thread] Current Thread [Next in Thread]