Remove run-test native binaries workaround

Becuase of a lack of a native binaries build leg, we were building the native corefx binaries during run-test. Now that we have those legs in CI, we can remove the workaround.

1 files changed, 31 insertions, 19 deletions

diff --git a/run-test.sh b/run-test.sh
index 540b1e3e68..bae7922287 100755
--- a/run-test.sh
+++ b/run-test.sh
@@ -22,23 +22,25 @@ usage()
     echo "usage: run-test [options]"
     echo
     echo "Input sources:"
-    echo "    --coreclr-bins <location>     Location of root of the binaries directory"
-    echo "                                  containing the linux/mac coreclr build"
-    echo "                                  default: <repo_root>/bin/Product/<OS>.x64.<Configuration>"
-    echo "    --mscorlib-bins <location>    Location of the root binaries directory containing"
-    echo "                                  the linux/mac mscorlib.dll"
-    echo "                                  default: <repo_root>/bin/Product/<OS>.x64.<Configuration>"
-    echo "    --corefx-tests <location>     Location of the root binaries location containing"
-    echo "                                  the windows tests"
-    echo "                                  default: <repo_root>/bin/tests/Windows_NT.AnyCPU.<Configuration>"
-    echo "    --corefx-bins <location>      Location of the linux/mac corefx binaries"
-    echo "                                  default: <repo_root>/bin/<OS>.AnyCPU.<Configuration>"
+    echo "    --coreclr-bins <location>         Location of root of the binaries directory"
+    echo "                                      containing the linux/mac coreclr build"
+    echo "                                      default: <repo_root>/bin/Product/<OS>.x64.<Configuration>"
+    echo "    --mscorlib-bins <location>        Location of the root binaries directory containing"
+    echo "                                      the linux/mac mscorlib.dll"
+    echo "                                      default: <repo_root>/bin/Product/<OS>.x64.<Configuration>"
+    echo "    --corefx-tests <location>         Location of the root binaries location containing"
+    echo "                                      the windows tests"
+    echo "                                      default: <repo_root>/bin/tests/Windows_NT.AnyCPU.<Configuration>"
+    echo "    --corefx-bins <location>          Location of the linux/mac corefx binaries"
+    echo "                                      default: <repo_root>/bin/<OS>.AnyCPU.<Configuration>"
+    echo "    --corefx-native-bins <location>   Location of the linux/mac native corefx binaries"
+    echo "                                      default: <repo_root>/bin/<OS>.x64.<Configuration>"
     echo
     echo "Flavor/OS options:"
-    echo "    --configuration <config>      Configuration to run (Debug/Release)"
-    echo "                                  default: Debug"
-    echo "    --os <os>                     OS to run (OSX/Linux)"
-    echo "                                  default: detect current OS"
+    echo "    --configuration <config>          Configuration to run (Debug/Release)"
+    echo "                                      default: Debug"
+    echo "    --os <os>                         OS to run (OSX/Linux)"
+    echo "                                      default: detect current OS"
     echo
     echo "Execution options:"
     echo "    --restrict-proj <regex>       Run test projects that match regex"
@@ -133,10 +135,12 @@ create_test_overlay()
   find $CoreFxBins -name '*.dll' -exec cp '{}' "$OverlayDir" ";"
 
   # Then the native CoreFX binaries
-  #
-  # TODO: Currently, CI does not build the native CoreFX components so build them here
-  #       in the test phase for now.
-  ( $ProjectRoot/src/Native/build.sh && cp $ProjectRoot/bin/$OS.x64.$Configuration/Native/* $OverlayDir ) || exit 1
+  if [ ! -d $CoreFxNativeBins ]
+  then
+	echo "Corefx native binaries should be built (use build.sh in root)"
+	exit 1
+  fi
+  cp $CoreFxNativeBins/* $OverlayDir
 }
 
 copy_test_overlay()
@@ -220,6 +224,9 @@ do
         --corefx-bins)
         CoreFxBins=$2
         ;;
+        --corefx-native-bins)
+        CoreFxNativeBins=$2
+        ;;
         --restrict-proj)
         TestSelection=$2
         ;;
@@ -257,6 +264,11 @@ then
     CoreFxBins="$ProjectRoot/bin/$OS.AnyCPU.$Configuration"
 fi
 
+if [ "$CoreFxNativeBins" == "" ]
+then
+    CoreFxNativeBins="$ProjectRoot/bin/$OS.x64.$Configuration/Native"
+fi
+
 # Check parameters up front for valid values:
 
 if [ ! "$Configuration" == "Debug" ] && [ ! "$Configuration" == "Release" ]