1 |
commit: 4281a2e29017daeddd1692866a9dcee01b11a67a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 29 12:12:48 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 29 12:16:47 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4281a2e2 |
7 |
|
8 |
dev-vcs/rcs: backport test fixes for 5.10.0 |
9 |
|
10 |
Note that these are purely test fixes, not changes |
11 |
in the logic of the program (=> no need to revbump). |
12 |
|
13 |
Bug: https://bugs.gentoo.org/820230 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch | 30 ++++++++++++++++++++++++++ |
17 |
dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch | 32 ++++++++++++++++++++++++++++ |
18 |
dev-vcs/rcs/rcs-5.10.0.ebuild | 2 ++ |
19 |
3 files changed, 64 insertions(+) |
20 |
|
21 |
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 |
22 |
new file mode 100644 |
23 |
index 00000000000..ea86af8fd02 |
24 |
--- /dev/null |
25 |
+++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch |
26 |
@@ -0,0 +1,30 @@ |
27 |
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=8883c4f5a29be18e9ea09bd27a7b660830de45bb |
28 |
+https://bugs.gentoo.org/820230 |
29 |
+ |
30 |
+From: Thien-Thi Nguyen <ttn@×××.org> |
31 |
+Date: Fri, 23 Oct 2020 09:23:49 -0400 |
32 |
+Subject: [v] Don't test signal handling if stdin not ok. |
33 |
+ |
34 |
+<https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html> |
35 |
+ |
36 |
+* tests/t632: If stdin is not open and connected to |
37 |
+a tty, skip the signal handling portion of the test. |
38 |
+--- a/tests/t632 |
39 |
++++ b/tests/t632 |
40 |
+@@ -40,6 +40,15 @@ echo | co -l -I $w \ |
41 |
+ # (This is skipped if GNU coreutils timeout(1) is not available.) |
42 |
+ ## |
43 |
+ |
44 |
++# <https://mail.gnu.org/archive/html/bug-rcs/2020-10/msg00014.html> |
45 |
++# The timeout test needs co(1) to block on input. |
46 |
++# If stdin is not open and connected to a tty, skip out. |
47 |
++if test -t 0 ; then |
48 |
++ echo STDIN OK |
49 |
++else |
50 |
++ exit 0 |
51 |
++fi |
52 |
++ |
53 |
+ # TODO: Don't be lame! Pick one: |
54 |
+ # (a) Mimic timeout(1) w/ sh commands. |
55 |
+ # (b) Incorporate heart of timeout(1) into ./btdt and use that. |
56 |
+cgit v1.2.1 |
57 |
|
58 |
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 |
59 |
new file mode 100644 |
60 |
index 00000000000..86ebab5f147 |
61 |
--- /dev/null |
62 |
+++ b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch |
63 |
@@ -0,0 +1,32 @@ |
64 |
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p&id=5df4567e69fc7f46d14cfbf396525c3d05bcf970 |
65 |
+https://bugs.gentoo.org/820230 |
66 |
+ |
67 |
+From: Thien-Thi Nguyen <ttn@×××.org> |
68 |
+Date: Sat, 24 Oct 2020 19:14:26 -0400 |
69 |
+Subject: [v] Try to handle whoami(1) returning no info. |
70 |
+MIME-Version: 1.0 |
71 |
+Content-Type: text/plain; charset=UTF-8 |
72 |
+Content-Transfer-Encoding: 8bit |
73 |
+ |
74 |
+* tests/t808 (user): If whoami(1) returns no info, no longer error out. |
75 |
+Instead, jam a value, and set env vars ‘LOGNAME’ and ‘USER’, as well. |
76 |
+--- a/tests/t808 |
77 |
++++ b/tests/t808 |
78 |
+@@ -24,8 +24,14 @@ rerr=$wd/rerr |
79 |
+ |
80 |
+ user=`whoami` |
81 |
+ |
82 |
+-test "$user" \ |
83 |
+- || problem 'far out, man ... whoami failed!' |
84 |
++if ! test "$user" ; then |
85 |
++ : 'far out, man ... whoami failed!' |
86 |
++ user=jrluser |
87 |
++ USER=$user |
88 |
++ export USER |
89 |
++ LOGNAME=$user |
90 |
++ export LOGNAME |
91 |
++fi |
92 |
+ |
93 |
+ must 'sed -e s/ttn/trulynobody/g \ |
94 |
+ -e s/zurg/$user/g \ |
95 |
+cgit v1.2.1 |
96 |
|
97 |
diff --git a/dev-vcs/rcs/rcs-5.10.0.ebuild b/dev-vcs/rcs/rcs-5.10.0.ebuild |
98 |
index 4bd994b8b2e..02c0dfa721c 100644 |
99 |
--- a/dev-vcs/rcs/rcs-5.10.0.ebuild |
100 |
+++ b/dev-vcs/rcs/rcs-5.10.0.ebuild |
101 |
@@ -20,6 +20,8 @@ RDEPEND=" |
102 |
DEPEND="${RDEPEND}" |
103 |
|
104 |
PATCHES=( |
105 |
+ "${FILESDIR}"/${P}-test-t808.patch |
106 |
+ "${FILESDIR}"/${P}-test-t632.patch |
107 |
"${FILESDIR}"/${P}-glibc-2.34.patch |
108 |
) |