Skip to content

Commit

Permalink
sys-devel/patch: fix test suite when using dash
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/738810
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <[email protected]>
  • Loading branch information
Whissi committed Apr 29, 2021
1 parent 50f6532 commit c02ca61
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288
http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5
https://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288
https://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5
https://git.savannah.gnu.org/cgit/patch.git/commit/?id=7623b2dc0d1837ecfd58f32efc78e35834deeb38

--- a/tests/crlf-handling
+++ b/tests/crlf-handling
Expand Down Expand Up @@ -117,4 +118,16 @@ http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c2
while test $# -gt 0 ; do
echo "$1"
shift
--

--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -113,7 +113,7 @@ cleanup() {
exit $status
}

-if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
+if ( eval 'test -n "${BASH_LINENO[0]}"' 2>/dev/null ); then
eval '
_start_test() {
printf "[${BASH_LINENO[2]}] %s -- " "$*"

0 comments on commit c02ca61

Please sign in to comment.