pyrox.dev
cryfs: Enable tests
+24
-1
pkgs/tools/filesystems/cryfs/default.nix
+24
-1
pkgs/tools/filesystems/cryfs/default.nix
···
35
35
36
36
buildInputs = [ boost cryptopp curl fuse openssl python spdlog ];
37
37
38
+
patches = [
39
+
./test-no-network.patch # Disable tests using external networking
40
+
./skip-failing-test-large-malloc.patch
41
+
];
42
+
38
43
# coreutils is needed for the vendored scrypt
39
44
nativeBuildInputs = [ cmake coreutils pkgconfig ];
40
45
···
43
48
cmakeFlags = [
44
49
"-DCRYFS_UPDATE_CHECKS=OFF"
45
50
"-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive
46
-
"-DBUILD_TESTING=OFF"
51
+
"-DBUILD_TESTING=ON"
47
52
];
53
+
54
+
doCheck = true;
55
+
56
+
# Cryfs tests are broken on darwin
57
+
checkPhase = stdenv.lib.optionalString (!stdenv.isDarwin) ''
58
+
# Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing)
59
+
SKIP_IMPURE_TESTS="CMakeFiles|fspp|cryfs-cli"
60
+
61
+
for test in `ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"`; do
62
+
"./$test`basename $test`-test"
63
+
done
64
+
'';
65
+
66
+
installPhase = ''
67
+
# Building with BUILD_TESTING=ON is missing the install target
68
+
mkdir -p $out/bin
69
+
install -m 755 ./src/cryfs-cli/cryfs $out/bin/cryfs
70
+
'';
48
71
49
72
meta = with stdenv.lib; {
50
73
description = "Cryptographic filesystem for the cloud";
+34
pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch
+34
pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch
···
1
+
From ad3f7e9fa2dececfaab43963887a2f03de52d659 Mon Sep 17 00:00:00 2001
2
+
From: adisbladis <adis@blad.is>
3
+
Date: Thu, 12 Oct 2017 21:45:26 +0800
4
+
Subject: [PATCH] Skip failing test: large malloc
5
+
6
+
---
7
+
test/cpp-utils/data/DataTest.cpp | 11 -----------
8
+
1 file changed, 11 deletions(-)
9
+
10
+
diff --git a/test/cpp-utils/data/DataTest.cpp b/test/cpp-utils/data/DataTest.cpp
11
+
index 6f9df070..bd426e62 100644
12
+
--- a/test/cpp-utils/data/DataTest.cpp
13
+
+++ b/test/cpp-utils/data/DataTest.cpp
14
+
@@ -191,17 +191,6 @@ TEST_F(DataTest, Inequality_DifferentLastByte) {
15
+
EXPECT_TRUE(data1 != data2);
16
+
}
17
+
18
+
-#ifdef __x86_64__
19
+
-TEST_F(DataTest, LargesizeSize) {
20
+
- //Needs 64bit for representation. This value isn't in the size param list, because the list is also used for read/write checks.
21
+
- uint64_t size = 4.5L*1024*1024*1024;
22
+
- Data data(size);
23
+
- EXPECT_EQ(size, data.size());
24
+
-}
25
+
-#else
26
+
-#warning This is not a 64bit architecture. Large size data tests are disabled.
27
+
-#endif
28
+
-
29
+
TEST_F(DataTest, LoadingNonexistingFile) {
30
+
TempFile file(false); // Pass false to constructor, so the tempfile is not created
31
+
EXPECT_FALSE(Data::LoadFromFile(file.path()));
32
+
--
33
+
2.14.2
34
+
+24
pkgs/tools/filesystems/cryfs/test-no-network.patch
+24
pkgs/tools/filesystems/cryfs/test-no-network.patch
···
1
+
From 8b1808e1278d2cb0dc56a4e98781eceeadfb9718 Mon Sep 17 00:00:00 2001
2
+
From: adisbladis <adis@blad.is>
3
+
Date: Thu, 12 Oct 2017 18:13:28 +0800
4
+
Subject: [PATCH] Disable tests using external networking
5
+
6
+
---
7
+
test/cpp-utils/CMakeLists.txt | 1 -
8
+
1 file changed, 1 deletion(-)
9
+
10
+
diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt
11
+
index 5a2bc9f8..d838edba 100644
12
+
--- a/test/cpp-utils/CMakeLists.txt
13
+
+++ b/test/cpp-utils/CMakeLists.txt
14
+
@@ -20,7 +20,6 @@ set(SOURCES
15
+
tempfile/TempFileIncludeTest.cpp
16
+
tempfile/TempDirIncludeTest.cpp
17
+
tempfile/TempDirTest.cpp
18
+
- network/CurlHttpClientTest.cpp
19
+
network/FakeHttpClientTest.cpp
20
+
io/ConsoleIncludeTest.cpp
21
+
io/ConsoleTest_AskYesNo.cpp
22
+
--
23
+
2.14.2
24
+