summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2018-08-09 16:28:47 +0200
committerMinijackson <minijackson@riseup.net>2018-08-09 16:28:47 +0200
commit2cfc46122f252637a7f767a00e2e12bedb92ef7d (patch)
tree07cd4879e505e572242602438d1525988d2f1b5d
parent78699269ab7da66730063c9e6ce1d88b7bd8fd6a (diff)
downloadnix_repo-2cfc46122f252637a7f767a00e2e12bedb92ef7d.tar.gz
nix_repo-2cfc46122f252637a7f767a00e2e12bedb92ef7d.zip
Separate normal sink and sink for testing
-rw-r--r--default.nix16
1 files changed, 9 insertions, 7 deletions
diff --git a/default.nix b/default.nix
index 16691c0..8fabba1 100644
--- a/default.nix
+++ b/default.nix
@@ -91,9 +91,13 @@ in rec {
91 ]; 91 ];
92 92
93 src = sinkSrc; 93 src = sinkSrc;
94 doCheck = true; 94 inherit cmakeBuildType;
95 # Only tests that does not involve external resources 95 };
96 checkPhase = '' 96
97 sinkTest = sink.overrideAttrs (oldAttrs: rec {
98 doCheck = true;
99 # Only tests that does not involve external resources
100 checkPhase = ''
97 export LD_LIBRARY_PATH=$PWD/tests:$PWD/examples/caldavresource/:$PWD/examples/dummyresource/:$PWD/tests/hawd:$PWD/common QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$PWD/../build-plugins/ PATH=$PATH:$PWD/synchronizer/ 101 export LD_LIBRARY_PATH=$PWD/tests:$PWD/examples/caldavresource/:$PWD/examples/dummyresource/:$PWD/tests/hawd:$PWD/common QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$PWD/../build-plugins/ PATH=$PATH:$PWD/synchronizer/
98 ./tests/clientapitest && 102 ./tests/clientapitest &&
99 ./tests/resourceconfigtest && 103 ./tests/resourceconfigtest &&
@@ -115,10 +119,8 @@ in rec {
115 ./tests/upgradetest && 119 ./tests/upgradetest &&
116 ./tests/resourcecontroltest && 120 ./tests/resourcecontroltest &&
117 ./tests/dummyresourcetest 121 ./tests/dummyresourcetest
118 ''; 122 '';
119 123 });
120 inherit cmakeBuildType;
121 };
122 124
123 kube = stdenv.mkDerivation { 125 kube = stdenv.mkDerivation {
124 name = "kube"; 126 name = "kube";