mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

quilt: Fix merge.test race condition

Browse Source 
This is consistently seen with musl and grep from busybox
Therefore backport a patch from upstream to fix it

(From OE-Core rev: 511bcd965af658e6bb0c61d9f2adb1af75af773b)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2023-04-24 22:27:41 -07:00
committed by Richard Purdie
parent 8a6f52393e
commit d0882a936e
2 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-devtools/quilt/quilt.inc
View File

@@ -13,6 +13,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
file://0001-tests-Allow-different-output-from-mv.patch \
file://fix-grep-3.8.patch \
file://faildiff-order.patch \
file://0001-test-Fix-a-race-condition-in-merge.test.patch \
"
SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch"

48
meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch Normal file
View File

@@ -0,0 +1,48 @@
From c1ce964f3e9312100a60f03c1e1fdd601e1911f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 28 Feb 2023 18:45:15 +0100
Subject: [PATCH] test: Fix a race condition in merge.test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Just like commit 4dfe7f9, (test: Fix a race condition, 2023-01-20),
this fix a test race when stdout and stderr in any order.
Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/quilt.git/commit/?id=c1ce964f3e9312100a60f03c1e1fdd601e1911f2]
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
test/merge.test | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/test/merge.test b/test/merge.test
index c64b33d..2e67d4f 100644
--- a/test/merge.test
+++ b/test/merge.test
@@ -39,8 +39,9 @@ Test the patch merging functionality of `quilt diff'.
> Applying patch %{P}c.diff
> Now at patch %{P}c.diff
- $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)"
+ $ quilt diff -P b.diff >/dev/null
> Warning: more recent patches modify files in patch %{P}b.diff
+ $ quilt diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)"
>~ Index: [^/]+/abc\.txt
> ===================================================================
> @@ -1,3 +1,3 @@
@@ -49,8 +50,9 @@ Test the patch merging functionality of `quilt diff'.
> +b+
> c
- $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)"
+ $ quilt diff --combine a.diff -P b.diff >/dev/null
> Warning: more recent patches modify files in patch %{P}b.diff
+ $ quilt diff --combine a.diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)"
>~ Index: [^/]+/abc\.txt
> ===================================================================
> @@ -1,3 +1,3 @@
--
2.40.0