Physically remove the folder src/coreclr/tests (#42828)

This change removes the last few files from src/coreclr/tests
under src/tests and finally depletes the folder. One change of note
is rename of src/coreclr/tests/runtest.py to src/tests/run.py
in accordance with the previous renames.

I have put the runparallel.sh script to src/tests as it seems
to have general usability, I moved the rest of the scripts to
src/tests/Common/scripts. I haven't actually tried to make it
work. I managed to catch one reference from arm32_ci_script /
arm_ci_test.sh to bringup_runtest.sh that I fixed but again
without actually testing them.

I am not too familiar with these scripts, I haven't found
references to them anywhere in the infra, some of them seem
related to the JIT team, adding Bruce to the PR to confirm.
I have no idea whether they are used at all, any insights into
what obsolete scripts we can get rid of is more than welcome.

Thanks

Tomas

diff --git a/src/coreclr/tests/NuGet.config b/src/coreclr/tests/NuGet.config
deleted file mode 100644 (file)
index c4fc054..0000000
--- a/src/coreclr/tests/NuGet.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="dotnet-corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
-  </packageSources>
-</configuration>

diff --git a/src/coreclr/tests/x64_arm64_altjit.cmd b/src/coreclr/tests/x64_arm64_altjit.cmd
deleted file mode 100644 (file)
index 2afdbba..0000000
--- a/src/coreclr/tests/x64_arm64_altjit.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-set COMPlus_AltJit=*
-set COMPlus_AltJitNgen=*
-set COMPlus_AltJitName=clrjit_win_arm64_x64.dll
-set COMPlus_NoGuiOnAssert=1
-set COMPlus_ContinueOnAssert=0
-set COMPlus_AltJitAssertOnNYI=1
-set COMPlus_SIMD16ByteOnly=1

diff --git a/src/coreclr/tests/x86_arm_altjit.cmd b/src/coreclr/tests/x86_arm_altjit.cmd
deleted file mode 100644 (file)
index 25232d0..0000000
--- a/src/coreclr/tests/x86_arm_altjit.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-set COMPlus_AltJit=*
-set COMPlus_AltJitNgen=*
-set COMPlus_AltJitName=clrjit_win_arm_x86.dll
-set COMPlus_NoGuiOnAssert=1
-set COMPlus_ContinueOnAssert=0
-set COMPlus_AltJitAssertOnNYI=1

diff --git a/src/tests/Common/scripts/arm32_ci_script.sh b/src/tests/Common/scripts/arm32_ci_script.sh
index 5ec34eb..1dd269c 100755 (executable)
--- a/src/tests/Common/scripts/arm32_ci_script.sh
+++ b/src/tests/Common/scripts/arm32_ci_script.sh
@@ -353,7 +353,7 @@ function copy_to_emulator {
 function run_tests {
     sudo chroot $__ARMEmulRootfs /bin/bash -x <<EOF
         cd "$__ARMEmulCoreclr"
-        ./tests/bringup_runtest.sh --sequential\
+        ./bringup_runtest.sh --sequential\
                            --testRootDir=$__testRootDirBase \
                            --mscorlibDir=$__mscorlibDirBase \
                            --coreFxNativeBinDir=$__coreFxNativeBinDirBase \

diff --git a/src/tests/Common/scripts/arm32_ci_test.sh b/src/tests/Common/scripts/arm32_ci_test.sh
index 965de58..d14c784 100755 (executable)
--- a/src/tests/Common/scripts/arm32_ci_test.sh
+++ b/src/tests/Common/scripts/arm32_ci_test.sh
@@ -105,7 +105,7 @@ rm -f -v ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}/bin/CoreFxBinDir/libcoreclrtracep
 
 chroot ${__ROOTFS_DIR} /bin/bash -x <<EOF
     cd ${ARM_CHROOT_HOME_DIR}
-    ./tests/bringup_runtest.sh --sequential\
+    ./bringup_runtest.sh --sequential\
                        --coreClrBinDir=${ARM_CHROOT_HOME_DIR}/artifacts/bin/coreclr/${__buildDirName} \
                        --mscorlibDir=${ARM_CHROOT_HOME_DIR}/artifacts/bin/coreclr/${__buildDirName} \
                        --testNativeBinDir=${ARM_CHROOT_HOME_DIR}/artifacts/obj/coreclr/${__buildDirName}/tests \

diff --git a/src/coreclr/tests/bringup_runtest.sh b/src/tests/Common/scripts/bringup_runtest.sh
similarity index 100%
rename from src/coreclr/tests/bringup_runtest.sh
rename to src/tests/Common/scripts/bringup_runtest.sh

diff --git a/src/tests/run.cmd b/src/tests/run.cmd
index 1362dad..512c890 100644 (file)
--- a/src/tests/run.cmd
+++ b/src/tests/run.cmd
@@ -116,7 +116,7 @@ set "__TestWorkingDir=%__RootBinDir%\tests\coreclr\%__TargetOS%.%__BuildArch%.%_
 if not defined XunitTestBinBase       set  XunitTestBinBase=%__TestWorkingDir%\
 if not defined XunitTestReportDirBase set  XunitTestReportDirBase=%XunitTestBinBase%\Reports\
 
-REM We are not running in the official build scenario, call runtest.py
+REM We are not running in the official build scenario, call run.py
 
 set __RuntestPyArgs=-arch %__BuildArch% -build_type %__BuildType%
 
@@ -176,7 +176,7 @@ if defined RunInUnloadableContext (
     set __RuntestPyArgs=%__RuntestPyArgs% --run_in_context
 )
 
-set NEXTCMD=python "%__RepoRootDir%\src\coreclr\tests\runtest.py" %__RuntestPyArgs%
+set NEXTCMD=python "%__RepoRootDir%\src\tests\run.py" %__RuntestPyArgs%
 echo !NEXTCMD!
 !NEXTCMD!
 

diff --git a/src/coreclr/tests/runtest.py b/src/tests/run.py
similarity index 98%
rename from src/coreclr/tests/runtest.py
rename to src/tests/run.py
index f387fa7..64bcf94 100755 (executable)
--- a/src/coreclr/tests/runtest.py
+++ b/src/tests/run.py
@@ -4,12 +4,12 @@
 ## The .NET Foundation licenses this file to you under the MIT license.
 #
 ##
-# Title:               runtest.py
+# Title:               run.py
 #
 # Notes:
 #  
 # Universal script to setup and run the xunit console runner. The script relies 
-# on runtest.proj and the bash and batch wrappers. All test excludes will also 
+# on run.proj and the bash and batch wrappers. All test excludes will also 
 # come from issues.targets. If there is a jit stress or gc stress exclude, 
 # please add GCStressIncompatible or JitOptimizationSensitive to the test's 
 # ilproj or csproj.
@@ -66,7 +66,7 @@ else:
     import urllib.request
 
 # Import coreclr_arguments.py from src\coreclr\scripts
-sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "scripts"))
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "coreclr", "scripts"))
 from coreclr_arguments import *
 
 ################################################################################
@@ -74,7 +74,7 @@ from coreclr_arguments import *
 ################################################################################
 
 description = ("""Universal script to setup and run the xunit console runner. The script relies 
-on runtest.proj and the bash and batch wrappers. All test excludes will also 
+on run.proj and the bash and batch wrappers. All test excludes will also 
 come from issues.targets. If there is a jit stress or gc stress exclude, 
 please add GCStressIncompatible or JitOptimizationSensitive to the test's 
 ilproj or csproj.
@@ -325,13 +325,13 @@ REM Repro environment for %s
 REM 
 REM Notes:
 REM 
-REM This wrapper is automatically generated by runtest.py. It includes the
+REM This wrapper is automatically generated by run.py. It includes the
 REM necessary environment to reproduce a failure that occured during running
 REM the tests.
 REM
 REM In order to change how this wrapper is generated, see
-REM runtest.py:__create_batch_wrapper__(). Please note that it is possible
-REM to recreate this file by running tests/runtest.py --analyze_results_only
+REM run.py:__create_batch_wrapper__(). Please note that it is possible
+REM to recreate this file by running src/tests/run.py --analyze_results_only
 REM with the appropriate environment set and the correct arch and build_type
 REM passed.
 REM
@@ -368,13 +368,13 @@ echo Core_Root is set to: "%%CORE_ROOT%%"
 # 
 # Notes:
 #
-# This wrapper is automatically generated by runtest.py. It includes the
+# This wrapper is automatically generated by run.py. It includes the
 # necessary environment to reproduce a failure that occured during running
 # the tests.
 #
 # In order to change how this wrapper is generated, see
-# runtest.py:__create_bash_wrapper__(). Please note that it is possible
-# to recreate this file by running tests/runtest.py --analyze_results_only
+# run.py:__create_bash_wrapper__(). Please note that it is possible
+# to recreate this file by running src/tests/run.py --analyze_results_only
 # with the appropriate environment set and the correct arch and build_type
 # passed.
 #
@@ -1123,7 +1123,7 @@ def setup_args(args):
     is_same_build_type = False
 
     # We will write out build information into the test directory. This is used
-    # by runtest.py to determine whether we need to rebuild the test wrappers.
+    # by run.py to determine whether we need to rebuild the test wrappers.
     if os.path.isfile(os.path.join(coreclr_setup_args.test_location, "build_info.json")):
         with open(os.path.join(coreclr_setup_args.test_location, "build_info.json")) as file_handle:
             build_info = json.load(file_handle)
@@ -1401,7 +1401,7 @@ def parse_test_results(args):
         for collection in assembly:
             if collection.tag == "errors" and collection.text != None:
                 # Something went wrong during running the tests.
-                print("Error running the tests, please run runtest.py again.")
+                print("Error running the tests, please run run.py again.")
                 sys.exit(1)
             elif collection.tag != "errors":
                 test_name = None

diff --git a/src/tests/run.sh b/src/tests/run.sh
index ac3d8df..3ad281a 100755 (executable)
--- a/src/tests/run.sh
+++ b/src/tests/run.sh
@@ -309,7 +309,7 @@ fi
 export COMPlus_gcServer="$serverGC"
 
 ################################################################################
-# Runtest.py
+# Run.py
 ################################################################################
 
 runtestPyArguments=("-arch" "${buildArch}" "-build_type" "${buildConfiguration}")
@@ -415,7 +415,7 @@ __Python=python
     __Python=python3
 fi
 
-# Run the tests using cross platform runtest.py
-echo "python $repoRootDir/src/coreclr/tests/runtest.py ${runtestPyArguments[@]}"
-$__Python "$repoRootDir/src/coreclr/tests/runtest.py" "${runtestPyArguments[@]}"
+# Run the tests using cross platform run.py
+echo "python $repoRootDir/src/tests/run.py ${runtestPyArguments[@]}"
+$__Python "$repoRootDir/src/tests/run.py" "${runtestPyArguments[@]}"
 exit "$?"

diff --git a/src/coreclr/tests/runparallel.sh b/src/tests/runparallel.sh
similarity index 100%
rename from src/coreclr/tests/runparallel.sh
rename to src/tests/runparallel.sh