1 files changed, 29 insertions, 32 deletions
diff --git a/default.nix b/default.nix
index 72b148b..d46f9d8 100644
--- a/default.nix
+++ b/default.nix
@@ -99,38 +99,35 @@ in rec {
        inherit cmakeBuildType;
    };
-    sinkTest = stdenv.mkDerivation {
+    sinkTest = pkgs.runCommand "sinkTest"
-      name = "sinkTest";
+      { buildInputs = [ sink ]; }
-      buildInputs = [ sink ];
+      ''
-      buildPhase = ''
+      export HOME="$(mktemp -d)"
-        export HOME="$(mktemp -d)"
+      cd "${sink}"
-        cd "${sink}"
+      ./tests/clientapitest &&
-        ./tests/clientapitest &&
+        ./tests/resourceconfigtest &&
-          ./tests/resourceconfigtest &&
+        ./tests/storagetest &&
-          ./tests/storagetest &&
+        ./tests/domainadaptortest &&
-          ./tests/domainadaptortest &&
+        ./tests/messagequeuetest &&
-          ./tests/messagequeuetest &&
+        ./tests/indextest &&
-          ./tests/indextest &&
+        ./tests/resourcecommunicationtest &&
-          ./tests/resourcecommunicationtest &&
+        ./tests/pipelinetest &&
-          ./tests/pipelinetest &&
+        ./tests/querytest &&
-          ./tests/querytest &&
+        ./tests/modelinteractivitytest &&
-          ./tests/modelinteractivitytest &&
+        ./tests/inspectiontest &&
-          ./tests/inspectiontest &&
+        ./tests/accountstest &&
-          ./tests/accountstest &&
+        ./tests/testaccounttest &&
-          ./tests/testaccounttest &&
+        ./tests/dummyresourcemailtest &&
-          ./tests/dummyresourcemailtest &&
+        ./tests/interresourcemovetest &&
-          ./tests/interresourcemovetest &&
+        ./tests/notificationtest &&
-          ./tests/notificationtest &&
+        ./tests/entitystoretest &&
-          ./tests/entitystoretest &&
+        ./tests/upgradetest &&
-          ./tests/upgradetest &&
+        ./tests/resourcecontroltest &&
-          ./tests/resourcecontroltest &&
+        ./tests/dummyresourcetest
-          ./tests/dummyresourcetest
+      ret=$?
-        ret=$?
+      rm -rf $HOME
-        rm -rf $HOME
+      return $ret
-        touch $out
+    '';
-        return $ret
-      '';
-    };
    kube = stdenv.mkDerivation {
        name = "kube";

diff --git a/default.nix b/default.nix index 72b148b..d46f9d8 100644 --- a/default.nix +++ b/default.nix
@@ -99,38 +99,35 @@ in rec {
99	inherit cmakeBuildType;	99	inherit cmakeBuildType;
100	};	100	};
101		101
102	sinkTest = stdenv.mkDerivation {	102	sinkTest = pkgs.runCommand "sinkTest"
103	name = "sinkTest";	103	{ buildInputs = [ sink ]; }
104	buildInputs = [ sink ];	104	''
105	buildPhase = ''	105	export HOME="$(mktemp -d)"
106	export HOME="$(mktemp -d)"	106	cd "${sink}"
107	cd "${sink}"	107	./tests/clientapitest &&
108	./tests/clientapitest &&	108	./tests/resourceconfigtest &&
109	./tests/resourceconfigtest &&	109	./tests/storagetest &&
110	./tests/storagetest &&	110	./tests/domainadaptortest &&
111	./tests/domainadaptortest &&	111	./tests/messagequeuetest &&
112	./tests/messagequeuetest &&	112	./tests/indextest &&
113	./tests/indextest &&	113	./tests/resourcecommunicationtest &&
114	./tests/resourcecommunicationtest &&	114	./tests/pipelinetest &&
115	./tests/pipelinetest &&	115	./tests/querytest &&
116	./tests/querytest &&	116	./tests/modelinteractivitytest &&
117	./tests/modelinteractivitytest &&	117	./tests/inspectiontest &&
118	./tests/inspectiontest &&	118	./tests/accountstest &&
119	./tests/accountstest &&	119	./tests/testaccounttest &&
120	./tests/testaccounttest &&	120	./tests/dummyresourcemailtest &&
121	./tests/dummyresourcemailtest &&	121	./tests/interresourcemovetest &&
122	./tests/interresourcemovetest &&	122	./tests/notificationtest &&
123	./tests/notificationtest &&	123	./tests/entitystoretest &&
124	./tests/entitystoretest &&	124	./tests/upgradetest &&
125	./tests/upgradetest &&	125	./tests/resourcecontroltest &&
126	./tests/resourcecontroltest &&	126	./tests/dummyresourcetest
127	./tests/dummyresourcetest	127	ret=$?
128	ret=$?	128	rm -rf $HOME
129	rm -rf $HOME	129	return $ret
130	touch $out	130	'';
131	return $ret
132	'';
133	};
134		131
135	kube = stdenv.mkDerivation {	132	kube = stdenv.mkDerivation {
136	name = "kube";	133	name = "kube";