From 0fb1f07f6deb8628d8dc6f9599512de8fc654ddf Mon Sep 17 00:00:00 2001
From: Timur <t-mustafin@partner.samsung.com>
Date: Wed, 28 Oct 2020 14:15:01 +0300
Subject: [PATCH] Remove --arch option from runtest.sh

Signed-off-by: Timur <t-mustafin@partner.samsung.com>
---
 packaging/coreclr.spec |  4 +++-
 tests/runtest.sh       | 25 ++++++-------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 01f5282..a012e65 100755
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -324,7 +324,9 @@ cp -rf %{_reldir}/lib         %{buildroot}%{_datadir}/%{netcoreappdir}
 %else
 cp tests/runtest.sh                             %{buildroot}/%{dotnettestdir}
 chmod +x %{buildroot}/%{dotnettestdir}/runtest.sh
-cp tests/unsupported*.%{_tarch}.txt             %{buildroot}/%{dotnettestdir} | true
+cp tests/unsupportedCrossgenLibs.%{_tarch}.txt      %{buildroot}/%{dotnettestdir}/unsupportedCrossgenLibs.txt | true
+cp tests/unsupportedCrossgenTests.%{_tarch}.txt     %{buildroot}/%{dotnettestdir}/unsupportedCrossgenTests.txt | true
+cp tests/unsupportedTests.%{_tarch}.txt             %{buildroot}/%{dotnettestdir}/unsupportedTests.txt | true
 
 %define _tcreldir     bin/tests/Linux.%{_barch}.%{_buildtype}
 cp -r %{_tcreldir}/* %{buildroot}/%{dotnettestdir}
diff --git a/tests/runtest.sh b/tests/runtest.sh
index 9abf620..0513f2e 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -4,13 +4,12 @@ function print_usage {
     echo ''
     echo 'CoreCLR test runner script.'
     echo 'Script uses next files if they exist:'
-    echo '    unsupportedTests.<arch>.txt'
-    echo '    unsupportedCrossgenLibs.<arch>.txt'
-    echo '    unsupportedCrossgenTests.<arch>.txt'
+    echo '    unsupportedTests.txt'
+    echo '    unsupportedCrossgenLibs.txt'
+    echo '    unsupportedCrossgenTests.txt'
     echo ''
     echo 'Typical Tizen command:'
     echo '    coreclr/tests/runtest.sh'
-    echo '    --arch=arm'
     echo '    --testRootDir="/opt/usr/coreclr-tc"'
     echo '    --coreOverlayDir="/opt/usr/coreclr-tc/coreroot"'
     echo '    --netcoreDir="/usr/share/dotnet.tizen/netcoreapp"'
@@ -24,7 +23,6 @@ function print_usage {
     echo '    --libsCrossgenFailOutputPath="/opt/usr/coreclr-tc/results/crossgenlibs.fail.txt"'
     echo ''
     echo 'Required arguments:'
-    echo '  --arch=<arch>                    : Target arch (for TW targets "arm" should be passed instead of "arm64").'
     echo '  --testRootDir=<path>             : Root directory of the test build (default: /opt/usr/coreclr-tc).'
     echo '  --coreOverlayDir=<path>          : Directory containing CLR and FX (default: /opt/usr/coreclr-tc/coreroot).'
     echo ''
@@ -378,11 +376,11 @@ function read_array {
 
 function load_unsupported_tests {
     # Load the list of tests that are not supported on this platform
-    unsupportedTests=($(read_array "$(dirname "$0")/unsupportedTests.$ARCH.txt"))
+    unsupportedTests=($(read_array "$(dirname "$0")/unsupportedTests.txt"))
     # Load the list of libs that are not supported for crossgen on this platform
-    unsupportedCrossGenLibs=($(read_array "$(dirname "$0")/unsupportedCrossgenLibs.$ARCH.txt"))
+    unsupportedCrossGenLibs=($(read_array "$(dirname "$0")/unsupportedCrossgenLibs.txt"))
     # Load the list of test that are not supported for crossgen on this platform
-    unsupportedCrossGenTests=($(read_array "$(dirname "$0")/unsupportedCrossgenTests.$ARCH.txt"))
+    unsupportedCrossGenTests=($(read_array "$(dirname "$0")/unsupportedCrossgenTests.txt"))
 }
 
 function is_unsupported_crossgen_lib {
@@ -750,9 +748,6 @@ do
         -v|--verbose)
             verbose=1
             ;;
-        --arch=*)
-            ARCH=${i#*=}
-            ;;
         --crossgen-libs)
             doCrossgenLibs=1
             ;;
@@ -834,12 +829,6 @@ do
     esac
 done
 
-if [ -z "$ARCH" ]; then
-    echo "--arch is required."
-    print_usage
-    exit $EXIT_CODE_EXCEPTION
-fi
-
 if [ -z "$testRootDir" ]; then
     echo "--testRootDir is required."
     print_usage
@@ -864,8 +853,6 @@ export CORE_ROOT="$coreOverlayDir"
 
 echo "! Make sure CLR/FX are copied to $coreOverlayDir !"
 
-echo "Running on CPU-$ARCH"
-
 xunit_output_begin
 text_file_output_begin
 load_unsupported_tests
-- 
2.7.4