summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Andreenko <seandree@microsoft.com>2019-03-28 18:54:03 -0700
committerGitHub <noreply@github.com>2019-03-28 18:54:03 -0700
commit3483c6e33b47bd956c433c7437bffad7ab5aca21 (patch)
treef1e2fc84ea09678d19b818895169b23efd5e20c0
parent9517ad0821e339418b3d3d31145dc0bbb1afc38d (diff)
downloadcoreclr-3483c6e33b47bd956c433c7437bffad7ab5aca21.tar.gz
coreclr-3483c6e33b47bd956c433c7437bffad7ab5aca21.tar.bz2
coreclr-3483c6e33b47bd956c433c7437bffad7ab5aca21.zip
Delete `setup_coredis_tools` from runtest.py. (#23495)
* Delete `setup_coredis_tools` from runtest.py. * delete dead `setup_coredis_tools` .
-rwxr-xr-xtests/runtest.py50
1 files changed, 1 insertions, 49 deletions
diff --git a/tests/runtest.py b/tests/runtest.py
index 335c5c6799..07005c9bdd 100755
--- a/tests/runtest.py
+++ b/tests/runtest.py
@@ -141,7 +141,6 @@ parser.add_argument("-test_native_bin_location", dest="test_native_bin_location"
################################################################################
g_verbose = False
-gc_stress_c = False
gc_stress = False
coredump_pattern = ""
file_name_cache = defaultdict(lambda: None)
@@ -451,7 +450,6 @@ def create_and_use_test_env(_os, env, func):
on windows, until xunit is used on unix there is no managed code run
in runtest.sh.
"""
- global gc_stress_c
global gc_stress
ret_code = 0
@@ -507,9 +505,6 @@ def create_and_use_test_env(_os, env, func):
else:
command = "export"
- if key.lower() == "complus_gcstress" and "c" in value.lower():
- gc_stress_c = True
-
if key.lower() == "complus_gcstress":
gc_stress = True
@@ -560,7 +555,6 @@ def get_environment(test_env=None):
On Windows, os.environ keys (the environment variable names) are all upper case,
and map lookup is case-insensitive on the key.
"""
- global gc_stress_c
global gc_stress
complus_vars = defaultdict(lambda: "")
@@ -601,9 +595,6 @@ def get_environment(test_env=None):
if "complus_gcstress" in complus_vars:
gc_stress = True
- if "c" in complus_vars["COMPlus_GCStress"].lower():
- gc_stress_c = True
-
return complus_vars
def call_msbuild(coreclr_repo_location,
@@ -1408,41 +1399,6 @@ def setup_tools(host_os, coreclr_repo_location):
return setup
-def setup_coredis_tools(coreclr_repo_location, host_os, arch, core_root):
- """ Setup CoreDisTools if needed
-
- Args:
- coreclr_repo_location(str) : coreclr repo location
- host_os(str) : os
- arch(str) : arch
- core_root(str) : core_root
- """
-
- if host_os.lower() == "osx":
- print("GCStress C is not supported on your platform.")
- sys.exit(1)
-
- unsupported_arches = ["arm", "arm64"]
-
- if arch in unsupported_arches:
- # Nothing to do; CoreDisTools unneeded.
- return
-
- command = None
- test_location = os.path.join(coreclr_repo_location, "tests")
- if host_os == "Windows_NT":
- command = [os.path.join(test_location, "setup-stress-dependencies.cmd"), "/arch", arch, "/outputdir", core_root]
- else:
- command = [os.path.join(test_location, "setup-stress-dependencies.sh"), "--outputDir=%s" % core_root]
-
- sys.stdout.flush() # flush output before creating sub-process
- proc = subprocess.Popen(command)
- proc.communicate()
-
- if proc.returncode != 0:
- print("Failed to set up stress dependencies.")
- sys.exit(1)
-
def precompile_core_root(test_location,
host_os,
arch,
@@ -2352,11 +2308,7 @@ def do_setup(host_os,
if unprocessed_args.precompile_core_root:
precompile_core_root(test_location, host_os, arch, core_root, use_jit_disasm=args.jitdisasm, altjit_name=unprocessed_args.crossgen_altjit)
-
- # If COMPlus_GCStress is set then we need to setup cordistools
- if gc_stress_c:
- setup_coredis_tools(coreclr_repo_location, host_os, arch, core_root)
-
+
build_info = None
is_same_os = None
is_same_arch = None