| 1 |
commit: a48e67d33ef6edd58b2cd6111884dbb4fdef7491 |
| 2 |
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info> |
| 3 |
AuthorDate: Wed Apr 29 10:00:59 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 29 15:21:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48e67d3 |
| 7 |
|
| 8 |
sys-apps/coreutils: Disable tests incompatible w/ sandbox |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/413621 |
| 11 |
Bug: https://bugs.gentoo.org/675802 |
| 12 |
Thanks-to: Kent Fredric |
| 13 |
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/15562 |
| 15 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-apps/coreutils/coreutils-8.31-r1.ebuild | 1 + |
| 18 |
sys-apps/coreutils/coreutils-8.32-r1.ebuild | 1 + |
| 19 |
.../files/coreutils-8.31-sandbox-env-test.patch | 64 ++++++++++++++++++++++ |
| 20 |
3 files changed, 66 insertions(+) |
| 21 |
|
| 22 |
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild |
| 23 |
index 48911f36982..007052ac9cf 100644 |
| 24 |
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild |
| 25 |
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild |
| 26 |
@@ -60,6 +60,7 @@ pkg_setup() { |
| 27 |
src_prepare() { |
| 28 |
if ! use vanilla ; then |
| 29 |
eapply "${WORKDIR}"/patch/*.patch |
| 30 |
+ eapply "${FILESDIR}"/${PN}-8.31-sandbox-env-test.patch |
| 31 |
fi |
| 32 |
|
| 33 |
eapply_user |
| 34 |
|
| 35 |
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild |
| 36 |
index d63be698dcc..3eac2b76aae 100644 |
| 37 |
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild |
| 38 |
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild |
| 39 |
@@ -71,6 +71,7 @@ src_prepare() { |
| 40 |
|
| 41 |
if ! use vanilla ; then |
| 42 |
PATCHES+=( "${WORKDIR}"/patch ) |
| 43 |
+ PATCHES+=( "${FILESDIR}"/${PN}-8.31-sandbox-env-test.patch ) |
| 44 |
fi |
| 45 |
|
| 46 |
default |
| 47 |
|
| 48 |
diff --git a/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch b/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch |
| 49 |
new file mode 100644 |
| 50 |
index 00000000000..40b1554d948 |
| 51 |
--- /dev/null |
| 52 |
+++ b/sys-apps/coreutils/files/coreutils-8.31-sandbox-env-test.patch |
| 53 |
@@ -0,0 +1,64 @@ |
| 54 |
+Skip tests known to fail when running under Gentoo sandbox. |
| 55 |
+ |
| 56 |
+--- a/tests/du/long-from-unreadable.sh |
| 57 |
++++ b/tests/du/long-from-unreadable.sh |
| 58 |
+@@ -29,6 +29,9 @@ |
| 59 |
+ # unnecessarily to using FTS_NOCHDIR mode in this corner case. |
| 60 |
+ |
| 61 |
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src |
| 62 |
++# Avoid #413621 until #548250 is resolved |
| 63 |
++test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" |
| 64 |
++ |
| 65 |
+ print_ver_ du |
| 66 |
+ |
| 67 |
+ require_perl_ |
| 68 |
+--- a/tests/ls/removed-directory.sh |
| 69 |
++++ b/tests/ls/removed-directory.sh |
| 70 |
+@@ -19,6 +19,9 @@ |
| 71 |
+ # along with this program. If not, see <https://www.gnu.org/licenses/>. |
| 72 |
+ |
| 73 |
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src |
| 74 |
++# Avoid #413621 until #548250 is resolved |
| 75 |
++test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" |
| 76 |
++ |
| 77 |
+ print_ver_ ls |
| 78 |
+ |
| 79 |
+ case $host_triplet in |
| 80 |
+--- a/tests/ls/stat-free-symlinks.sh |
| 81 |
++++ b/tests/ls/stat-free-symlinks.sh |
| 82 |
+@@ -17,6 +17,9 @@ |
| 83 |
+ # along with this program. If not, see <https://www.gnu.org/licenses/>. |
| 84 |
+ |
| 85 |
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src |
| 86 |
++# Avoid #413621 until #548250 is resolved |
| 87 |
++test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" |
| 88 |
++ |
| 89 |
+ print_ver_ ls |
| 90 |
+ require_strace_ stat |
| 91 |
+ |
| 92 |
+--- a/tests/misc/env-S.pl |
| 93 |
++++ b/tests/misc/env-S.pl |
| 94 |
+@@ -30,6 +30,11 @@ $env = $1; |
| 95 |
+ # Turn off localization of executable's output. |
| 96 |
+ @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; |
| 97 |
+ |
| 98 |
++# Skip if sandbox is enabled |
| 99 |
++if ($ENV{SANDBOX_ACTIVE}) { |
| 100 |
++ CuSkip::skip "Gentoo: Test known bad under sandbox (#675802)\n"; |
| 101 |
++} |
| 102 |
++ |
| 103 |
+ my @Tests = |
| 104 |
+ ( |
| 105 |
+ # Test combination of -S and regular arguments |
| 106 |
+--- a/tests/rm/deep-2.sh |
| 107 |
++++ b/tests/rm/deep-2.sh |
| 108 |
+@@ -17,6 +17,9 @@ |
| 109 |
+ # along with this program. If not, see <https://www.gnu.org/licenses/>. |
| 110 |
+ |
| 111 |
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src |
| 112 |
++# Avoid #413621 until #548250 is resolved |
| 113 |
++test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)" |
| 114 |
++ |
| 115 |
+ print_ver_ rm |
| 116 |
+ require_perl_ |
| 117 |
+ |
Archives