diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-01-24 13:59:29 -0800 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-01-24 15:35:40 -0800 |
| commit | 0509183c860f54e230ea3aa65aedc8ee3b62f782 (patch) | |
| tree | 1c25b5be2362210dca85a26ac563b6ca4be694e4 /netci.groovy | |
| parent | 6a3c584b80dde7752a595344b3dc727918c94183 (diff) | |
| download | coreclr-0509183c860f54e230ea3aa65aedc8ee3b62f782.tar.gz coreclr-0509183c860f54e230ea3aa65aedc8ee3b62f782.tar.bz2 coreclr-0509183c860f54e230ea3aa65aedc8ee3b62f782.zip | |
Fix runtest.sh build of Coreoverlay to account for new directory strucure in CoreFX
Diffstat (limited to 'netci.groovy')
| -rwxr-xr-x | netci.groovy | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/netci.groovy b/netci.groovy index 6203a03888..313cd565ba 100755 --- a/netci.groovy +++ b/netci.groovy @@ -2467,7 +2467,7 @@ combinedScenarios.each { scenario -> copyArtifacts("${corefxFolder}/linuxarmemulator_softfp_cross_${lowerConfiguration}") { includePatterns('bin/build.tar.gz') buildSelector { - latestSaved() + latestSuccessful(true) } } } @@ -2787,9 +2787,6 @@ combinedScenarios.each { scenario -> // Get corefx shell("git clone https://github.com/dotnet/corefx fx") - // CoreFX is changing their output format and scripts, pick a stable version until all that work has landed. - shell("git -C ./fx checkout 551fe49174378adcbf785c0ab12fc69355cef6e8") - // Build Linux corefx shell("./fx/build-native.sh -release -buildArch=x64 -os=Linux") shell("./fx/build-managed.sh -release -buildArch=x64 -osgroup=Linux -skiptests") @@ -2815,8 +2812,7 @@ combinedScenarios.each { scenario -> --testNativeBinDir=\"\$(pwd)/clr/bin/obj/${osGroup}.${architecture}.${configuration}/tests\" \\ --coreClrBinDir=\"\$(pwd)/clr/bin/Product/${osGroup}.${architecture}.${configuration}\" \\ --mscorlibDir=\"\$(pwd)/clr/bin/Product/${osGroup}.${architecture}.${configuration}\" \\ - --coreFxBinDir=\"\$(pwd)/fx/bin/${osGroup}.AnyCPU.Release;\$(pwd)/fx/bin/Unix.AnyCPU.Release;\$(pwd)/fx/bin/AnyOS.AnyCPU.Release\" \\ - --coreFxNativeBinDir=\"\$(pwd)/fx/bin/${osGroup}.${architecture}.Release\" \\ + --coreFxBinDir=\"\$(pwd)/fx/bin/runtime/netcoreapp-${osGroup}-${configuration}-${architecture}\" \\ --crossgen --runcrossgentests""") // Run coreclr tests w/ server GC & HeapVerify enabled @@ -2855,7 +2851,7 @@ combinedScenarios.each { scenario -> copyArtifacts("${corefxFolder}/${osJobName}_release") { includePatterns('bin/build.tar.gz') buildSelector { - latestSaved() + latestSuccessful(true) } } @@ -2884,8 +2880,7 @@ combinedScenarios.each { scenario -> --testNativeBinDir=\"\${WORKSPACE}/bin/obj/${osGroup}.${architecture}.${configuration}/tests\" \\ --coreClrBinDir=\"\${WORKSPACE}/bin/Product/${osGroup}.${architecture}.${configuration}\" \\ --mscorlibDir=\"\${WORKSPACE}/bin/Product/${osGroup}.${architecture}.${configuration}\" \\ - --coreFxBinDir=\"\${WORKSPACE}/bin/${osGroup}.AnyCPU.Release;\${WORKSPACE}/bin/Unix.AnyCPU.Release;\${WORKSPACE}/bin/AnyOS.AnyCPU.Release\" \\ - --coreFxNativeBinDir=\"\${WORKSPACE}/bin/${osGroup}.${architecture}.Release\" \\ + --coreFxBinDir=\"\$(pwd)/fx/bin/runtime/netcoreapp-${osGroup}-${configuration}-${architecture}\" \\ --limitedDumpGeneration \\ ${testEnvOpt} ${serverGCString} ${gcstressStr} ${crossgenStr} ${runcrossgentestsStr} ${runjitstressStr} ${runjitstressregsStr} ${runjitmioptsStr} ${runjitforcerelocsStr} ${runjitdisasmStr} ${sequentialString} ${playlistString}""") } |