From b33335a144143017bb8da5960c5cc3f17ed5ba5a Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Tue, 8 Dec 2015 08:59:27 -0800 Subject: [PATCH] Skip tests on Mono if KOREBUILD_TEST_SKIPMONO is set. --- KoreBuild-dotnet/build/_dotnet-test.shade | 12 ++++++++++-- build/_k-test.shade | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/KoreBuild-dotnet/build/_dotnet-test.shade b/KoreBuild-dotnet/build/_dotnet-test.shade index a771237b54..b1e67c55f1 100644 --- a/KoreBuild-dotnet/build/_dotnet-test.shade +++ b/KoreBuild-dotnet/build/_dotnet-test.shade @@ -3,6 +3,7 @@ use import="Environment" default NO_PARALLEL_TEST_PROJECTS='${E("NO_PARALLEL_TEST_PROJECTS")}' default KOREBUILD_TEST_DNXCORE='${E("KOREBUILD_TEST_DNXCORE")}' +default KOREBUILD_TEST_SKIPMONO='${E("KOREBUILD_TEST_SKIPMONO")}' @{/* @@ -59,9 +60,16 @@ projectFile='' testArgs = " -parallel none"; } - // Dotnet("test" + testArgs, projectFolder); + if (!IsLinux || + (!string.Equals(KOREBUILD_TEST_SKIPMONO, "1") && + !string.Equals(KOREBUILD_TEST_SKIPMONO, "true"))) + { + // Dotnet("test" + testArgs, projectFolder); + } } - else if (!IsLinux || !string.IsNullOrEmpty(KOREBUILD_TEST_DNXCORE)) + else if (!IsLinux || + string.Equals(KOREBUILD_TEST_DNXCORE, "1") || + string.Equals(KOREBUILD_TEST_DNXCORE, "true")) { // Dotnet("test" + testArgs, projectFolder, "default -runtime coreclr"); } diff --git a/build/_k-test.shade b/build/_k-test.shade index 55c6e08481..88ac0e4585 100644 --- a/build/_k-test.shade +++ b/build/_k-test.shade @@ -3,6 +3,7 @@ use import="Environment" default NO_PARALLEL_TEST_PROJECTS='${E("NO_PARALLEL_TEST_PROJECTS")}' default KOREBUILD_TEST_DNXCORE='${E("KOREBUILD_TEST_DNXCORE")}' +default KOREBUILD_TEST_SKIPMONO='${E("KOREBUILD_TEST_SKIPMONO")}' @{/* @@ -58,9 +59,16 @@ projectFile='' testArgs = " -parallel none"; } - Dnx("test" + testArgs, projectFolder); + if (!IsLinux || + (!string.Equals(KOREBUILD_TEST_SKIPMONO, "1") && + !string.Equals(KOREBUILD_TEST_SKIPMONO, "true"))) + { + Dnx("test" + testArgs, projectFolder); + } } - else if (!IsLinux || !string.IsNullOrEmpty(KOREBUILD_TEST_DNXCORE)) + else if (!IsLinux || + string.Equals(KOREBUILD_TEST_DNXCORE, "1") || + string.Equals(KOREBUILD_TEST_DNXCORE, "true")) { Dnx("test" + testArgs, projectFolder, "default -runtime coreclr"); }