huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Skip tests on Mono if KOREBUILD_TEST_SKIPMONO is set.

This commit is contained in:
Cesar Blum Silveira 2015-12-08 08:59:27 -08:00
parent ce4d24159e
commit b33335a144
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
KoreBuild-dotnet/build/_dotnet-test.shade
View File

@ -3,6 +3,7 @@ use import="Environment"
default NO_PARALLEL_TEST_PROJECTS='${E("NO_PARALLEL_TEST_PROJECTS")}' default NO_PARALLEL_TEST_PROJECTS='${E("NO_PARALLEL_TEST_PROJECTS")}'
default KOREBUILD_TEST_DNXCORE='${E("KOREBUILD_TEST_DNXCORE")}' default KOREBUILD_TEST_DNXCORE='${E("KOREBUILD_TEST_DNXCORE")}'
default KOREBUILD_TEST_SKIPMONO='${E("KOREBUILD_TEST_SKIPMONO")}'
@{/* @{/*
@ -59,9 +60,16 @@ projectFile=''
testArgs = " -parallel none"; 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"); // Dotnet("test" + testArgs, projectFolder, "default -runtime coreclr");
} }

12
build/_k-test.shade
View File

@ -3,6 +3,7 @@ use import="Environment"
default NO_PARALLEL_TEST_PROJECTS='${E("NO_PARALLEL_TEST_PROJECTS")}' default NO_PARALLEL_TEST_PROJECTS='${E("NO_PARALLEL_TEST_PROJECTS")}'
default KOREBUILD_TEST_DNXCORE='${E("KOREBUILD_TEST_DNXCORE")}' default KOREBUILD_TEST_DNXCORE='${E("KOREBUILD_TEST_DNXCORE")}'
default KOREBUILD_TEST_SKIPMONO='${E("KOREBUILD_TEST_SKIPMONO")}'
@{/* @{/*
@ -58,9 +59,16 @@ projectFile=''
testArgs = " -parallel none"; 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"); Dnx("test" + testArgs, projectFolder, "default -runtime coreclr");
} }