| 1 |
commit: bdc5fe9844e7008398befa52f8187849d9014b7d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 31 20:41:04 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 1 08:53:20 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc5fe98 |
| 7 |
|
| 8 |
sys-fs/cryfs: Disable hanging tests |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/699044 |
| 11 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-fs/cryfs/cryfs-0.10.2.ebuild | 11 ++++++----- |
| 15 |
sys-fs/cryfs/cryfs-9999.ebuild | 11 ++++++----- |
| 16 |
2 files changed, 12 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild |
| 19 |
index 56ffbdfc545..b305bf454db 100644 |
| 20 |
--- a/sys-fs/cryfs/cryfs-0.10.2.ebuild |
| 21 |
+++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild |
| 22 |
@@ -57,6 +57,10 @@ src_prepare() { |
| 23 |
# remove tests that require internet access to comply with Gentoo policy |
| 24 |
sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \ |
| 25 |
-i test/cpp-utils/CMakeLists.txt || die |
| 26 |
+ |
| 27 |
+ # /dev/fuse access denied |
| 28 |
+ sed -e "/CliTest_IntegrityCheck/d" \ |
| 29 |
+ -i test/cryfs-cli/CMakeLists.txt || die |
| 30 |
} |
| 31 |
|
| 32 |
src_configure() { |
| 33 |
@@ -74,16 +78,13 @@ src_configure() { |
| 34 |
|
| 35 |
src_test() { |
| 36 |
local TMPDIR="${T}" |
| 37 |
- addread /dev/fuse |
| 38 |
- addwrite /dev/fuse |
| 39 |
local tests_failed=() |
| 40 |
|
| 41 |
- for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do |
| 42 |
+ # fspp fuse tests hang, bug # 699044 |
| 43 |
+ for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do |
| 44 |
"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" ) |
| 45 |
done |
| 46 |
|
| 47 |
- adddeny /dev/fuse |
| 48 |
- |
| 49 |
if [[ -n ${tests_failed[@]} ]] ; then |
| 50 |
eerror "The following tests failed:" |
| 51 |
eerror "${tests_failed[@]}" |
| 52 |
|
| 53 |
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild |
| 54 |
index d401918aecc..5cd7961f399 100644 |
| 55 |
--- a/sys-fs/cryfs/cryfs-9999.ebuild |
| 56 |
+++ b/sys-fs/cryfs/cryfs-9999.ebuild |
| 57 |
@@ -53,6 +53,10 @@ src_prepare() { |
| 58 |
# remove tests that require internet access to comply with Gentoo policy |
| 59 |
sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \ |
| 60 |
-i test/cpp-utils/CMakeLists.txt || die |
| 61 |
+ |
| 62 |
+ # /dev/fuse access denied |
| 63 |
+ sed -e "/CliTest_IntegrityCheck/d" \ |
| 64 |
+ -i test/cryfs-cli/CMakeLists.txt || die |
| 65 |
} |
| 66 |
|
| 67 |
src_configure() { |
| 68 |
@@ -69,16 +73,13 @@ src_configure() { |
| 69 |
|
| 70 |
src_test() { |
| 71 |
local TMPDIR="${T}" |
| 72 |
- addread /dev/fuse |
| 73 |
- addwrite /dev/fuse |
| 74 |
local tests_failed=() |
| 75 |
|
| 76 |
- for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do |
| 77 |
+ # fspp fuse tests hang, bug # 699044 |
| 78 |
+ for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do |
| 79 |
"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" ) |
| 80 |
done |
| 81 |
|
| 82 |
- adddeny /dev/fuse |
| 83 |
- |
| 84 |
if [[ -n ${tests_failed[@]} ]] ; then |
| 85 |
eerror "The following tests failed:" |
| 86 |
eerror "${tests_failed[@]}" |
Archives