diff options
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt/faildiff-order.patch | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index d7ecda7aaa..ad23b8d922 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
@@ -12,6 +12,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ | |||
12 | file://Makefile \ | 12 | file://Makefile \ |
13 | file://test.sh \ | 13 | file://test.sh \ |
14 | file://0001-tests-Allow-different-output-from-mv.patch \ | 14 | file://0001-tests-Allow-different-output-from-mv.patch \ |
15 | file://faildiff-order.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | SRC_URI_append_class-target = " file://gnu_patch_test_fix_target.patch" | 18 | SRC_URI_append_class-target = " file://gnu_patch_test_fix_target.patch" |
diff --git a/meta/recipes-devtools/quilt/quilt/faildiff-order.patch b/meta/recipes-devtools/quilt/quilt/faildiff-order.patch new file mode 100644 index 0000000000..40f3c2636a --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/faildiff-order.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | This test assumes that two lines that are output on different streams (stdout | ||
2 | and stderr) will be read in the same order, but thanks to buffering that may not | ||
3 | be the case. | ||
4 | |||
5 | Change the expected lines to be regexs that each match both expected lines, so | ||
6 | the test always works no matter the actual order the lines are read in. | ||
7 | |||
8 | Bug filed at https://savannah.nongnu.org/bugs/index.php?63651 to discuss a | ||
9 | proper solution. | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
12 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
13 | |||
14 | diff --git a/test/faildiff.test b/test/faildiff.test | ||
15 | index 5afb8e3..5f32f71 100644 | ||
16 | --- a/test/faildiff.test | ||
17 | +++ b/test/faildiff.test | ||
18 | @@ -28,8 +28,8 @@ What happens on binary files? | ||
19 | |||
20 | $ printf "\\003\\000\\001" > test.bin | ||
21 | $ quilt diff -pab --no-index | ||
22 | - >~ (Files|Binary files) a/test\.bin and b/test\.bin differ | ||
23 | - > Diff failed on file 'test.bin', aborting | ||
24 | + >~ (.*[Ff]iles a/test\.bin and b/test\.bin differ|Diff failed on file 'test.bin', aborting) | ||
25 | + >~ (.*[Ff]iles a/test\.bin and b/test\.bin differ|Diff failed on file 'test.bin', aborting) | ||
26 | $ echo %{?} | ||
27 | > 1 | ||
28 | |||