From: Swaroop Sridhar <swaroops@microsoft.com>
Date: Wed, 29 Mar 2017 01:51:56 +0000 (-0700)
Subject: Fix some bugs in Linux ILLINK testing.
X-Git-Tag: submit/tizen/20210909.063632~11030^2~7507
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bcfc43346b6d68b53d6f95ed7beb1ff4abe84b3;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix some bugs in Linux ILLINK testing.

Fix a few problems in the <test>.sh generation for
running CoreCLR tests on Linux via ILLINK


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

diff --git a/src/coreclr/tests/src/CLRTest.Execute.Bash.targets b/src/coreclr/tests/src/CLRTest.Execute.Bash.targets
index 4f5cee8..62cda21 100644
--- a/src/coreclr/tests/src/CLRTest.Execute.Bash.targets
+++ b/src/coreclr/tests/src/CLRTest.Execute.Bash.targets
@@ -235,20 +235,23 @@ then
   if [  $ERRORLEVEL -ne 0 ]
   then
     echo ILLINK FAILED $ERRORLEVEL
-    if [ ! -z "$KeepLinkedBinaries" ]; 
+    if [ -z "$KeepLinkedBinaries" ]; 
     then
       rm -rf $LinkBin
     fi
     exit 1
   fi
   
-  # Copy CORECLR native binaries to $LinkBin, so that we can run the test based on that directory
-  cp $CORE_ROOT/clrjit.dll $LinkBin
-  cp $CORE_ROOT/coreclr.dll $LinkBin 
-  cp $CORE_ROOT/mscorrc.dll $LinkBin
-  cp $CORE_ROOT/CoreRun.exe $LinkBin
+  # Copy CORECLR native binaries to $LinkBin, 
+  # so that we can run the test based on that directory
+  cp $CORE_ROOT/*.so $LinkBin/
+  cp $CORE_ROOT/corerun $LinkBin/
+
   # Copy some files that may be arguments
-  cp *.txt $LinkBin
+  for f in *.txt;
+  do
+    [ -e "$f" ] && cp $f $LinkBin
+  done
 
   ExePath=$LinkBin/$(InputAssemblyName)
   export CORE_ROOT=$PWD/$LinkBin
@@ -262,7 +265,7 @@ fi
 
 if [ ! -z "$DoLink" ]; 
 then
-  if [ ! -z "$KeepLinkedBinaries" ]; 
+  if [ -z "$KeepLinkedBinaries" ]; 
   then
     rm -rf $LinkBin
   fi