From 1ab429eacfacc8ca19c96322eec234e1d0dabc98 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 1 Jul 2016 10:15:06 -0700 Subject: [PATCH] do all coreclr copying BEFORE building Commit migrated from https://github.com/dotnet/coreclr/commit/a4a3df7e0d58dc93e44600a1d8d0cc11e0acdd2a --- src/coreclr/netci.groovy | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy index 4d99f06..3647dca 100755 --- a/src/coreclr/netci.groovy +++ b/src/coreclr/netci.groovy @@ -2067,25 +2067,27 @@ combinedScenarios.each { scenario -> } if (scenario == 'coverage') { - shell("./build.sh coverage verbose ${lowerConfiguration} ${architecture}") + + // Move coreclr to clr directory + shell("rm -rf .clr; mkdir .clr; mv * .clr; mv .git .clr; mv .clr clr") + + // Build coreclr + shell("./clr/build.sh coverage verbose ${lowerConfiguration} ${architecture}") // Remove folders from obj that we don't expect to be covered. May update this later. - shell("rm -rf ./bin/obj/Linux.x64.Release/src/ToolBox") - shell("rm -rf ./bin/obj/Linux.x64.Release/src/debug") - shell("rm -rf ./bin/obj/Linux.x64.Release/src/ilasm") - shell("rm -rf ./bin/obj/Linux.x64.Release/src/ildasm") - shell("rm -rf ./bin/obj/Linux.x64.Release/src/dlls/dbgshim") - shell("rm -rf ./bin/obj/Linux.x64.Release/src/dlls/mscordac") - shell("rm -rf ./bin/obj/Linux.x64.Release/src/dlls/mscordbi") + shell("rm -rf ./clr/bin/obj/Linux.x64.Release/src/ToolBox") + shell("rm -rf ./clr/bin/obj/Linux.x64.Release/src/debug") + shell("rm -rf ./clr/bin/obj/Linux.x64.Release/src/ilasm") + shell("rm -rf ./clr/bin/obj/Linux.x64.Release/src/ildasm") + shell("rm -rf ./clr/bin/obj/Linux.x64.Release/src/dlls/dbgshim") + shell("rm -rf ./clr/bin/obj/Linux.x64.Release/src/dlls/mscordac") + shell("rm -rf ./clr/bin/obj/Linux.x64.Release/src/dlls/mscordbi") // Run PAL tests - shell("src/pal/tests/palsuite/runpaltests.sh \${WORKSPACE}/bin/obj/${osGroup}.${architecture}.${configuration} \${WORKSPACE}/bin/paltestout") + shell("./clr/src/pal/tests/palsuite/runpaltests.sh \$(pwd)/clr/bin/obj/${osGroup}.${architecture}.${configuration} \$(pwd)/clr/bin/paltestout") // Remove obj files for PAL tests so they're not included in coverage results - shell("rm -rf ./bin/obj/Linux.x64.Release/src/pal/tests") - - // Move coreclr to clr directory - shell("rm -rf .clr; mkdir .clr; mv * .clr; mv .git .clr; mv .clr clr") + shell("rm -rf ./clr/bin/obj/Linux.x64.Release/src/pal/tests") // Unzip the tests first. Exit with 0 shell("unzip -q -o ./clr/bin/tests/tests.zip -d ./clr/bin/tests/Windows_NT.${architecture}.${configuration} || exit 0") -- 2.7.4