From b6f152345d707f1f6ec615b6850577cc6c8b0a21 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 10 Aug 2018 11:06:32 +0200 Subject: Try something else --- default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/default.nix b/default.nix index a372bba..c75c368 100644 --- a/default.nix +++ b/default.nix @@ -90,18 +90,17 @@ in rec { "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" ]; + postInstall = '' + mkdir -p $out/tests + cp ./tests/clientapitest ./tests/resourceconfigtest ./tests/storagetest ./tests/domainadaptortest ./tests/messagequeuetest ./tests/indextest ./tests/resourcecommunicationtest ./tests/pipelinetest ./tests/querytest ./tests/modelinteractivitytest ./tests/inspectiontest ./tests/accountstest ./tests/testaccounttest ./tests/dummyresourcemailtest ./tests/interresourcemovetest ./tests/notificationtest ./tests/entitystoretest ./tests/upgradetest ./tests/resourcecontroltest ./tests/dummyresourcetest $out/tests + ''; + src = sinkSrc; inherit cmakeBuildType; }; - sinkTest = sink.overrideAttrs (oldAttrs: rec { - doCheck = true; - # Only tests that does not involve external resources - checkPhase = '' - export HOME="$PWD" - mkdir -p plugins/sink/resources - ln -s examples/*resource/libsink_resource*.so plugins/sink/resources/ - export LD_LIBRARY_PATH=$PWD/tests:$PWD/examples/caldavresource/:$PWD/examples/dummyresource/:$PWD/tests/hawd:$PWD/common QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$PWD/plugins/ PATH=$PATH:$PWD/synchronizer/ + sinkTest = pkgs.writeShellScriptBin "sinkTest" '' + export HOME="$(mktemp -d)" ./tests/clientapitest && ./tests/resourceconfigtest && ./tests/storagetest && @@ -122,8 +121,11 @@ in rec { ./tests/upgradetest && ./tests/resourcecontroltest && ./tests/dummyresourcetest + ret=$? + rm -rf $HOME + return $ret ''; - }); + }; kube = stdenv.mkDerivation { name = "kube"; -- cgit v1.2.3