1*4882a593SmuzhiyunUpstream-Status: Backport 2*4882a593SmuzhiyunSigned-off-by: Ross Burton <ross.burton@arm.com> 3*4882a593Smuzhiyun 4*4882a593SmuzhiyunFrom 4dfe7f9e702c85243a71e4de267a13e434b6d6c2 Mon Sep 17 00:00:00 2001 5*4882a593SmuzhiyunFrom: Jean Delvare <jdelvare@suse.de> 6*4882a593SmuzhiyunDate: Fri, 20 Jan 2023 12:56:08 +0100 7*4882a593SmuzhiyunSubject: [PATCH] test: Fix a race condition 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunThe test suite does not differentiate between stdout and stderr. When 10*4882a593Smuzhiyunmessages are printed to both, the order in which they will reach us 11*4882a593Smuzhiyunis apparently not guaranteed. Ideally this would be deterministic, but 12*4882a593Smuzhiyununtil then, explicitly test stdout and stderr separately in the test 13*4882a593Smuzhiyuncase itself. Otherwise the test suite fails randomly, which is a pain 14*4882a593Smuzhiyunfor distribution package maintainers. 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunThis fixes bug #63651 reported by Ross Burton: 17*4882a593Smuzhiyunhttps://savannah.nongnu.org/bugs/index.php?63651 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunSigned-off-by: Jean Delvare <jdelvare@suse.de> 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun test/faildiff.test | 3 ++- 22*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 1 deletion(-) 23*4882a593Smuzhiyun 24*4882a593Smuzhiyundiff --git a/test/faildiff.test b/test/faildiff.test 25*4882a593Smuzhiyunindex 5afb8e3..0444c15 100644 26*4882a593Smuzhiyun--- a/test/faildiff.test 27*4882a593Smuzhiyun+++ b/test/faildiff.test 28*4882a593Smuzhiyun@@ -27,8 +27,9 @@ What happens on binary files? 29*4882a593Smuzhiyun > File test.bin added to patch %{P}test.diff 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun $ printf "\\003\\000\\001" > test.bin 32*4882a593Smuzhiyun- $ quilt diff -pab --no-index 33*4882a593Smuzhiyun+ $ quilt diff -pab --no-index 2>/dev/null 34*4882a593Smuzhiyun >~ (Files|Binary files) a/test\.bin and b/test\.bin differ 35*4882a593Smuzhiyun+ $ quilt diff -pab --no-index >/dev/null 36*4882a593Smuzhiyun > Diff failed on file 'test.bin', aborting 37*4882a593Smuzhiyun $ echo %{?} 38*4882a593Smuzhiyun > 1 39*4882a593Smuzhiyun-- 40*4882a593Smuzhiyun2.34.1 41*4882a593Smuzhiyun 42