Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0

external/corefx/run-test.sh

@@ -31,7 +31,7 @@ usage()
     echo "                                      default: Debug"
     echo "    --os <os>                         OS to run (FreeBSD, Linux, NetBSD or OSX)"
     echo "                                      default: detect current OS"
-    echo "    --arch <Architecture>             Architecture to run (x64, arm, x86, arm64)"
+    echo "    --arch <Architecture>             Architecture to run (x64, arm, armel, x86, arm64)"
     echo "                                      default: detect current architecture"
     echo
     echo "Execution options:"
@@ -197,14 +197,10 @@ run_test()
     exit 0
   fi
 
-  dirName="$1/netcoreapp"
-
+  dirName="$1/netcoreapp-$OS-$ConfigurationGroup-$__Arch"
   if [ ! -d "$dirName" ]; then
-    dirName="$1/netstandard"
-    if [ ! -d "$dirName" ]; then
-        echo "Nothing to test in $testProject"
-        return
-    fi
+    echo "Nothing to test in $testProject"
+    return
   fi
 
   if [ ! -e "$dirName/RunTests.sh" ]; then
@@ -308,6 +304,9 @@ do
         --os)
         OS=$2
         ;;
+        --arch)
+        __Arch=$2
+        ;;
         --coreclr-coverage)
         CoreClrCoverage=ON
         ;;
@@ -397,9 +396,7 @@ if [ -n "$TestDirFile" ] || [ -n "$TestDir" ]
 then
     run_selected_tests
 else
-    run_all_tests "$CoreFxTests/AnyOS.AnyCPU.$ConfigurationGroup/"*.Tests
-    run_all_tests "$CoreFxTests/Unix.AnyCPU.$ConfigurationGroup/"*.Tests
-    run_all_tests "$CoreFxTests/$OS.AnyCPU.$ConfigurationGroup/"*.Tests
+    run_all_tests "$CoreFxTests/tests/"*.Tests
 fi
 
 if [ "$CoreClrCoverage" == "ON" ]