blob: 40f3c2636a53b9f0b1811079fc291021e318e1f8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
This test assumes that two lines that are output on different streams (stdout
and stderr) will be read in the same order, but thanks to buffering that may not
be the case.
Change the expected lines to be regexs that each match both expected lines, so
the test always works no matter the actual order the lines are read in.
Bug filed at https://savannah.nongnu.org/bugs/index.php?63651 to discuss a
proper solution.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@arm.com>
diff --git a/test/faildiff.test b/test/faildiff.test
index 5afb8e3..5f32f71 100644
--- a/test/faildiff.test
+++ b/test/faildiff.test
@@ -28,8 +28,8 @@ 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
- > Diff failed on file 'test.bin', aborting
+ >~ (.*[Ff]iles a/test\.bin and b/test\.bin differ|Diff failed on file 'test.bin', aborting)
+ >~ (.*[Ff]iles a/test\.bin and b/test\.bin differ|Diff failed on file 'test.bin', aborting)
$ echo %{?}
> 1
|
