Test suite: fix Korn shell incompatibility
tests/merge: In a Korn shell, shift apparently fails when $# is 0
This commit is contained in:
parent
ad2aa68086
commit
77894f3f9d
28
Test-suite-fix-Korn-shell-incompatibility.patch
Normal file
28
Test-suite-fix-Korn-shell-incompatibility.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 8f52e719d7b35e9f89b1e75d3aa8d3063de6d81a Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Gruenbacher <agruen@gnu.org>
|
||||
Date: Wed, 7 Feb 2018 17:05:00 +0100
|
||||
Subject: [PATCH] Test suite: fix Korn shell incompatibility
|
||||
|
||||
tests/merge: In a Korn shell, shift apparently fails when $# is 0.
|
||||
|
||||
Signed-off-by: Xibo.Wang <wangxb12@chinatelecom.cn>
|
||||
---
|
||||
tests/merge | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/merge b/tests/merge
|
||||
index b628891..e950b92 100644
|
||||
--- a/tests/merge
|
||||
+++ b/tests/merge
|
||||
@@ -32,7 +32,7 @@ x2() {
|
||||
shift
|
||||
done > b.sed
|
||||
echo "$body" | sed -f b.sed > b
|
||||
- shift
|
||||
+ test $# -eq 0 || shift
|
||||
while test $# -gt 0 ; do
|
||||
echo "$1"
|
||||
shift
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: patch
|
||||
Version: 2.7.6
|
||||
Release: 15
|
||||
Release: 16
|
||||
Summary: Utiliity which applies a patch file to original files.
|
||||
License: GPLv3+
|
||||
URL: http://www.gnu.org/software/patch/patch.html
|
||||
@ -16,6 +16,7 @@ Patch7: CVE-2019-13636.patch
|
||||
Patch8: patch-selinux.patch
|
||||
Patch9: Avoid-set_file_attributes-sign-conversion-warnings.patch
|
||||
Patch10: Test-suite-compatibility-fixes.patch
|
||||
Patch11: Test-suite-fix-Korn-shell-incompatibility.patch
|
||||
|
||||
BuildRequires: gcc libselinux-devel libattr-devel ed
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-root
|
||||
@ -58,6 +59,9 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Wed Dec 28 2022 Xibo.Wang <wangxb12@chinatelecom.cn> - 2.7.6-16
|
||||
- Test suite: fix Korn shell incompatibility
|
||||
|
||||
* Wed Dec 28 2022 Xibo.Wang <wangxb12@chinatelecom.cn> - 2.7.6-15
|
||||
- Test suite compatibility fixes
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user