diff options
author | Vincent Haupert <mail@vincent-haupert.de> | 2022-01-28 09:39:53 +0100 |
---|---|---|
committer | Vincent Haupert <mail@vincent-haupert.de> | 2022-01-28 09:44:29 +0100 |
commit | 4be414dc95a9e901d9ca1cc887a22b3fd0a565e5 (patch) | |
tree | ece9349d79e3d0b4f31ac9d58a44bbec25c00c21 /pkgs/development/tools/continuous-integration/github-runner/default.nix | |
parent | 1126f8282a4d1c7159a2cec03190ef4f61c457f1 (diff) | |
download | nixpkgs-4be414dc95a9e901d9ca1cc887a22b3fd0a565e5.tar nixpkgs-4be414dc95a9e901d9ca1cc887a22b3fd0a565e5.tar.gz nixpkgs-4be414dc95a9e901d9ca1cc887a22b3fd0a565e5.tar.bz2 nixpkgs-4be414dc95a9e901d9ca1cc887a22b3fd0a565e5.tar.lz nixpkgs-4be414dc95a9e901d9ca1cc887a22b3fd0a565e5.tar.xz nixpkgs-4be414dc95a9e901d9ca1cc887a22b3fd0a565e5.tar.zst nixpkgs-4be414dc95a9e901d9ca1cc887a22b3fd0a565e5.zip |
github-runner: refactor `disabledTests`
Make the `disabledTests` attribute a list of disabled tests matched exactly by their fully qualified name. Also mention the disabled tests in the `checkPhase`.
Diffstat (limited to 'pkgs/development/tools/continuous-integration/github-runner/default.nix')
-rw-r--r-- | pkgs/development/tools/continuous-integration/github-runner/default.nix | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 75af3a21237..c3b9e987b43 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { # Disable specific tests substituteInPlace src/dir.proj \ --replace 'dotnet test Test/Test.csproj' \ - "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" disabledTests}'" + "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" (map (x: "FullyQualifiedName!=${x}") disabledTests)}'" # We don't use a Git checkout substituteInPlace src/dir.proj \ @@ -137,10 +137,10 @@ stdenv.mkDerivation rec { doCheck = true; + # Fully qualified name of disabled tests disabledTests = - [ "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync" ] ++ map - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_${x}") - [ + [ "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync" ] + ++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_${x}") [ "Cancel_CloneHashTask_WhenNotNeeded" "CloneHash_RuntimeAndExternals" "DownloadRetry" @@ -150,15 +150,8 @@ stdenv.mkDerivation rec { "UseExternalsRuntimeTrimmedPackage" "UseExternalsTrimmedPackage" "ValidateHash" - ] ++ [ - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" - ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" - ] ++ map - # Online tests - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") - [ + ] + ++ map (x: "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [ "CompositeActionWithActionfile_CompositeContainerNested" "CompositeActionWithActionfile_CompositePrestepNested" "CompositeActionWithActionfile_MaxLimit" @@ -188,11 +181,15 @@ stdenv.mkDerivation rec { "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" "RepositoryActionWithWrapperActionfile_PreSteps" "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" - ] ++ map - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") - [ + ] + ++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [ "EnsureDotnetsdkBashDownloadScriptUpToDate" "EnsureDotnetsdkPowershellDownloadScriptUpToDate" + ] + ++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ] + ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" + "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" ]; checkInputs = [ git ]; @@ -204,6 +201,8 @@ stdenv.mkDerivation rec { ln -s ${nodejs-12_x} _layout/externals/node12 ln -s ${nodejs-16_x} _layout/externals/node16 + printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}' + # BUILDCONFIG needs to be "Debug" dotnet msbuild \ -t:test \ |