From 7d70d35787dc1a32f82bf452f2c410bf2628763e Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 8 Mar 2023 22:17:09 +0000 Subject: [PATCH] xrootd: decouple test-runner build and passthru.tests.test-runner --- pkgs/tools/networking/xrootd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 586e726b3d4a..69313eabb8bf 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -16,7 +16,7 @@ , systemd , voms , zlib -, enableTests ? stdenv.isLinux +, enableTestRunner ? true # If not null, the builder will # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc. , externalEtc ? "/etc" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "man" ]; - passthru.tests = lib.optionalAttrs enableTests { + passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { test-runner = callPackage ./test-runner.nix { }; }; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { systemd voms ] - ++ lib.optionals enableTests [ + ++ lib.optionals enableTestRunner [ cppunit ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { 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" ];