Fix netci.groovy

Fix netci.groovy instead of test script to avoid rebase

Commit migrated from https://github.com/dotnet/coreclr/commit/f97deb9529200d18ec01aaf546b23cbb61419246

diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy
index d548171..c5f17c4 100755 (executable)
--- a/src/coreclr/netci.groovy
+++ b/src/coreclr/netci.groovy
@@ -1637,6 +1637,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                     // Unpack the corefx binaries
                     buildCommands += "mkdir ./bin/CoreFxBinDir"
                     buildCommands += "tar -xf ./bin/build.tar.gz -C ./bin/CoreFxBinDir"
+                    buildCommands += "sudo chmod a+x ./bin/CoreFxBinDir/corerun"
 
                     // Call the ARM CI script to cross build and test using docker
                     buildCommands += """./tests/scripts/arm32_ci_script.sh \\

diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh
index 602fe19..402b924 100755 (executable)
--- a/src/coreclr/tests/runtest.sh
+++ b/src/coreclr/tests/runtest.sh
@@ -353,8 +353,8 @@ function create_core_overlay {
     fi
     mkdir "$coreOverlayDir"
 
+    cp -f -v "$coreFxBinDir/"* "$coreOverlayDir/" 2>/dev/null
     cp -f -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null
-    cp -n -v "$coreFxBinDir/"* "$coreOverlayDir/" 2>/dev/null
     if [ -d "$mscorlibDir/bin" ]; then
         cp -f -v "$mscorlibDir/bin/"* "$coreOverlayDir/" 2>/dev/null
     fi