From: Sung-Jae Lee <sjlee@mail.com>
Date: Thu, 1 Sep 2016 08:06:30 +0000 (+0900)
Subject: Prevent build output contamination while building test overlay
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6621d062ecaaa104c674cd235e8499ce820ba39;p=platform%2Fupstream%2Fcoreclr.git

Prevent build output contamination while building test overlay

While building test overlay, all files in `$mscorlibDir/bin` are
copyed to `$mscorlibDir` where usually `$coreclrBinDir`.
It contaminates build output. This commit prevent it by moving
copy commend to function `create_core_overlay`.
---

diff --git a/tests/runtest.sh b/tests/runtest.sh
index f585992e43..cd5da9484d 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -383,7 +383,10 @@ function create_core_overlay {
     cp -f -v "$coreFxNativeBinDir/Native/"*."$libExtension" "$coreOverlayDir/" 2>/dev/null
 
     cp -f -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null
-    cp -f -v "$mscorlibDir/mscorlib.dll" "$coreOverlayDir/"
+    cp -f -v "$mscorlibDir/mscorlib.dll" "$coreOverlayDir/" 2>/dev/null
+    if [ -d "$mscorlibDir/bin" ]; then
+        cp -f -v "$mscorlibDir/bin/"* "$coreOverlayDir/" 2>/dev/null
+    fi
     cp -n -v "$testDependenciesDir"/* "$coreOverlayDir/" 2>/dev/null
     if [ -f "$coreOverlayDir/mscorlib.ni.dll" ]; then
         # Test dependencies come from a Windows build, and mscorlib.ni.dll would be the one from Windows
@@ -1111,9 +1114,6 @@ fi
 if [ -z "$mscorlibDir" ]; then
     mscorlibDir=$coreClrBinDir
 fi
-if [ -d "$mscorlibDir" ] && [ -d "$mscorlibDir/bin" ]; then
-    cp $mscorlibDir/bin/* $mscorlibDir
-fi
 
 if [ ! -z "$longgc" ]; then
     echo "Running Long GC tests"