Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 7371dea

Browse files
authored
Update how we pass parameters when building CoreFx (#6511)
Change how we pass parameters when building CoreFx
1 parent 23b20c4 commit 7371dea

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

netci.groovy

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ combinedScenarios.each { scenario ->
15931593
buildCommands += getStressModeEnvSetCmd(os, scenario);
15941594

15951595
// Run corefx build and testing
1596-
buildCommands += "cd fx && call \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" x86 && Build.cmd /p:ConfigurationGroup=Release /p:BUILDTOOLS_OVERRIDE_RUNTIME=%WORKSPACE%\\clr\\bin\\Product\\Windows_NT.x64.Checked "
1596+
buildCommands += "cd fx && call \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" x86 && Build.cmd -Release -- /p:BUILDTOOLS_OVERRIDE_RUNTIME=%WORKSPACE%\\clr\\bin\\Product\\Windows_NT.x64.Checked "
15971597
}
15981598
else {
15991599
def stepScriptLocation = "%WORKSPACE%\\bin\\tests\\SetStressModes.bat"
@@ -1737,7 +1737,7 @@ combinedScenarios.each { scenario ->
17371737
// Build and text corefx
17381738
buildCommands += "rm -rf \$WORKSPACE/fx_home; mkdir \$WORKSPACE/fx_home"
17391739
buildCommands += setEnvVar
1740-
buildCommands += "cd fx; export HOME=\$WORKSPACE/fx_home; ./build.sh /p:ConfigurationGroup=Release /p:BUILDTOOLS_OVERRIDE_RUNTIME=\$WORKSPACE/clr/bin/Product/Linux.x64.Checked /p:Outerloop=true /p:TestWithLocalLibraries=true"
1740+
buildCommands += "cd fx; export HOME=\$WORKSPACE/fx_home; ./build.sh -Release -Outerloop -TestWithLocalLibraries -- /p:BUILDTOOLS_OVERRIDE_RUNTIME=\$WORKSPACE/clr/bin/Product/Linux.x64.Checked"
17411741

17421742
// Archive and process test result
17431743
Utilities.addArchival(newJob, "fx/bin/tests/**/testResults.xml")
@@ -2144,7 +2144,8 @@ combinedScenarios.each { scenario ->
21442144
shell("git clone https://github.com/dotnet/corefx fx")
21452145

21462146
// Build Linux corefx
2147-
shell("./fx/build.sh x64 release Linux skiptests")
2147+
shell("./fx/build-native.sh -release -buildArch=x64 -os=Linux")
2148+
shell("./fx/build-managed.sh -release -buildArch=x64 -osgroup=Linux -skiptests")
21482149

21492150
def testEnvOpt = ""
21502151
def scriptFileName = "\$WORKSPACE/set_stress_test_env.sh"

0 commit comments

Comments
 (0)