mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-19 13:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

quilt: use upstreamed faildiff.test fix

Browse Source 
(From OE-Core rev: 444494290c349d481a164b865ef97db7f84ffd44)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 50b81a263187af4452d3b99967bffd01c6ddb476)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2023-01-20 12:53:13 +00:00
committed by Richard Purdie
parent 1d3f2be1e6
commit 358c909fc7
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-devtools/quilt/quilt/faildiff-order.patch
View File

@@ -1,28 +1,41 @@
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
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
From 4dfe7f9e702c85243a71e4de267a13e434b6d6c2 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Fri, 20 Jan 2023 12:56:08 +0100
Subject: [PATCH] test: Fix a race condition
The test suite does not differentiate between stdout and stderr. When
messages are printed to both, the order in which they will reach us
is apparently not guaranteed. Ideally this would be deterministic, but
until then, explicitly test stdout and stderr separately in the test
case itself. Otherwise the test suite fails randomly, which is a pain
for distribution package maintainers.
This fixes bug #63651 reported by Ross Burton:
https://savannah.nongnu.org/bugs/index.php?63651
Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
test/faildiff.test | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/faildiff.test b/test/faildiff.test
index 5afb8e3..5f32f71 100644
index 5afb8e3..0444c15 100644
--- a/test/faildiff.test
+++ b/test/faildiff.test
@@ -28,8 +28,8 @@ What happens on binary files?
@@ -27,8 +27,9 @@ What happens on binary files?
> File test.bin added to patch %{P}test.diff
$ 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)
- $ quilt diff -pab --no-index
+ $ quilt diff -pab --no-index 2>/dev/null
>~ (Files|Binary files) a/test\.bin and b/test\.bin differ
+ $ quilt diff -pab --no-index >/dev/null
> Diff failed on file 'test.bin', aborting
$ echo %{?}
> 1
--
2.34.1