diff options
Diffstat (limited to 'dev-vcs/rcs/files')
-rw-r--r-- | dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch | 30 | ||||
-rw-r--r-- | dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch | 32 | ||||
-rw-r--r-- | dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch | 24 |
3 files changed, 86 insertions, 0 deletions
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch new file mode 100644 index 000000000000..ea86af8fd022 --- /dev/null +++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch @@ -0,0 +1,30 @@ +https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=8883c4f5a29be18e9ea09bd27a7b660830de45bb +https://bugs.gentoo.org/820230 + +From: Thien-Thi Nguyen <ttn@gnu.org> +Date: Fri, 23 Oct 2020 09:23:49 -0400 +Subject: [v] Don't test signal handling if stdin not ok. + +<https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html> + +* tests/t632: If stdin is not open and connected to +a tty, skip the signal handling portion of the test. +--- a/tests/t632 ++++ b/tests/t632 +@@ -40,6 +40,15 @@ echo | co -l -I $w \ + # (This is skipped if GNU coreutils timeout(1) is not available.) + ## + ++# <https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html> ++# The timeout test needs co(1) to block on input. ++# If stdin is not open and connected to a tty, skip out. ++if test -t 0 ; then ++ echo STDIN OK ++else ++ exit 0 ++fi ++ + # TODO: Don't be lame! Pick one: + # (a) Mimic timeout(1) w/ sh commands. + # (b) Incorporate heart of timeout(1) into ./btdt and use that. +cgit v1.2.1 diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch new file mode 100644 index 000000000000..86ebab5f1475 --- /dev/null +++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch @@ -0,0 +1,32 @@ +https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=5df4567e69fc7f46d14cfbf396525c3d05bcf970 +https://bugs.gentoo.org/820230 + +From: Thien-Thi Nguyen <ttn@gnu.org> +Date: Sat, 24 Oct 2020 19:14:26 -0400 +Subject: [v] Try to handle whoami(1) returning no info. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* tests/t808 (user): If whoami(1) returns no info, no longer error out. +Instead, jam a value, and set env vars ‘LOGNAME’ and ‘USER’, as well. +--- a/tests/t808 ++++ b/tests/t808 +@@ -24,8 +24,14 @@ rerr=$wd/rerr + + user=`whoami` + +-test "$user" \ +- || problem 'far out, man ... whoami failed!' ++if ! test "$user" ; then ++ : 'far out, man ... whoami failed!' ++ user=jrluser ++ USER=$user ++ export USER ++ LOGNAME=$user ++ export LOGNAME ++fi + + must 'sed -e s/ttn/trulynobody/g \ + -e s/zurg/$user/g \ +cgit v1.2.1 diff --git a/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch new file mode 100644 index 000000000000..568731e1903f --- /dev/null +++ b/dev-vcs/rcs/files/rcs-5.9.4-test-t810.patch @@ -0,0 +1,24 @@ +https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=f2330a6268d244e97f47a97f4767736fc3b31455 +https://bugs.gentoo.org/820230 + +From: Thien-Thi Nguyen <ttn@gnu.org> +Date: Thu, 5 Apr 2018 16:20:35 +0200 +Subject: [v] Avoid "test FILE1 -nt FILE2". + +* tests/t810: Use "btdt mtimecmp" instead of "test -nt". +Thanks to both sergio and Xose Vazquez Perez +for indirectly signalling this problem. See 2018-04-05, +"Add support for "btdt mtimecmp FILE1 FILE2"" for details. +--- a/tests/t810 ++++ b/tests/t810 +@@ -27,7 +27,8 @@ split_std_out_err no + + must 'echo new line >> $w' + must 'ci -mm -l -d -T $w' +-test $w -nt $v && problem "$w newer than $v" ++test 1 = `./btdt mtimecmp $w $v` \ ++ && problem "$w newer than $v" + + exit 0 + +cgit v1.2.1 |