dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

xrootd: decouple test-runner build and passthru.tests.test-runner

Browse Source
This commit is contained in:
Yueh-Shun Li 2023-03-08 22:17:09 +00:00
parent e4053b1a46
commit 7d70d35787
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/xrootd/default.nix
View File

@ -16,7 +16,7 @@
, systemd , systemd
, voms , voms
, zlib , zlib
, enableTests ? stdenv.isLinux , enableTestRunner ? true
# If not null, the builder will # If not null, the builder will
# move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc. # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc.
, externalEtc ? "/etc" , externalEtc ? "/etc"
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" "dev" "man" ]; outputs = [ "bin" "out" "dev" "man" ];
passthru.tests = lib.optionalAttrs enableTests { passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
test-runner = callPackage ./test-runner.nix { }; test-runner = callPackage ./test-runner.nix { };
}; };
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
systemd systemd
voms voms
] ]
++ lib.optionals enableTests [ ++ lib.optionals enableTestRunner [
cppunit cppunit
]; ];
@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket
''; '';
cmakeFlags = lib.optionals enableTests [ cmakeFlags = lib.optionals enableTestRunner [
"-DENABLE_TESTS=TRUE" "-DENABLE_TESTS=TRUE"
]; ];