diff options
| author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2023-02-28 18:45:15 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2023-02-28 18:45:15 +0100 |
| commit | c1ce964f3e9312100a60f03c1e1fdd601e1911f2 (patch) | |
| tree | b7b495f58fcd73b7666981d298a236012060a9f2 | |
| parent | 4dfe7f9e702c85243a71e4de267a13e434b6d6c2 (diff) | |
| download | quilt-c1ce964f3e9312100a60f03c1e1fdd601e1911f2.tar.gz | |
test: Fix a race condition in merge.test
Just like commit 4dfe7f9, (test: Fix a race condition, 2023-01-20),
this fix a test race when stdout and stderr in any order.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Jean Delvare <jdelvare@suse.de>
| -rw-r--r-- | test/merge.test | 6 |
1 files 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 @@ |