Remove legacy make env variables
These are rarely used and some of the newly added variants
are also missing the support. To keep the consistency, removing the
support for the others as well.
Test: ./art/test/testrunner/testrunner.py
Change-Id: If80718803f44744525404f08f4aa8d1461d88655
diff --git a/test/testrunner/env.py b/test/testrunner/env.py
index d45d009..05bda70 100644
--- a/test/testrunner/env.py
+++ b/test/testrunner/env.py
@@ -118,79 +118,9 @@
# Do you want all tests, even those that are time consuming?
ART_TEST_FULL = _getEnvBoolean('ART_TEST_FULL', False)
-# Do you want interpreter tests run?
-ART_TEST_INTERPRETER = _getEnvBoolean('ART_TEST_INTERPRETER', ART_TEST_FULL)
-ART_TEST_INTERPRETER_ACCESS_CHECKS = _getEnvBoolean('ART_TEST_INTERPRETER_ACCESS_CHECKS',
- ART_TEST_FULL)
-
-# Do you want JIT tests run?
-ART_TEST_JIT = _getEnvBoolean('ART_TEST_JIT', ART_TEST_FULL)
-
-# Do you want optimizing compiler tests run?
-ART_TEST_OPTIMIZING = _getEnvBoolean('ART_TEST_OPTIMIZING', ART_TEST_FULL)
-
-# Do you want to test the optimizing compiler with graph coloring register allocation?
-ART_TEST_OPTIMIZING_GRAPH_COLOR = _getEnvBoolean('ART_TEST_OPTIMIZING_GRAPH_COLOR', ART_TEST_FULL)
-
-# Do you want to do run-tests with profiles?
-ART_TEST_SPEED_PROFILE = _getEnvBoolean('ART_TEST_SPEED_PROFILE', ART_TEST_FULL)
-
-# Do we want to test PIC-compiled tests ("apps")?
-ART_TEST_PIC_TEST = _getEnvBoolean('ART_TEST_PIC_TEST', ART_TEST_FULL)
-# Do you want tracing tests run?
-ART_TEST_TRACE = _getEnvBoolean('ART_TEST_TRACE', ART_TEST_FULL)
-
-# Do you want tracing tests (streaming mode) run?
-ART_TEST_TRACE_STREAM = _getEnvBoolean('ART_TEST_TRACE_STREAM', ART_TEST_FULL)
-
-# Do you want tests with GC verification enabled run?
-ART_TEST_GC_VERIFY = _getEnvBoolean('ART_TEST_GC_VERIFY', ART_TEST_FULL)
-
-# Do you want tests with the GC stress mode enabled run?
-ART_TEST_GC_STRESS = _getEnvBoolean('ART_TEST_GC_STRESS', ART_TEST_FULL)
-
-# Do you want tests with the JNI forcecopy mode enabled run?
-ART_TEST_JNI_FORCECOPY = _getEnvBoolean('ART_TEST_JNI_FORCECOPY', ART_TEST_FULL)
-
-# Do you want run-tests with relocation disabled run?
-ART_TEST_RUN_TEST_RELOCATE = _getEnvBoolean('ART_TEST_RUN_TEST_RELOCATE', ART_TEST_FULL)
-
-# Do you want run-tests with prebuilding?
-ART_TEST_RUN_TEST_PREBUILD = _getEnvBoolean('ART_TEST_RUN_TEST_PREBUILD', ART_TEST_FULL)
-
-# Do you want run-tests with no prebuilding enabled run?
-ART_TEST_RUN_TEST_NO_PREBUILD = _getEnvBoolean('ART_TEST_RUN_TEST_NO_PREBUILD', ART_TEST_FULL)
-
-# Do you want run-tests with a pregenerated core.art?
-ART_TEST_RUN_TEST_IMAGE = _getEnvBoolean('ART_TEST_RUN_TEST_IMAGE', ART_TEST_FULL)
-
-# Do you want run-tests without a pregenerated core.art?
-ART_TEST_RUN_TEST_NO_IMAGE = _getEnvBoolean('ART_TEST_RUN_TEST_NO_IMAGE', ART_TEST_FULL)
-
-# Do you want run-tests with relocation enabled but patchoat failing?
-ART_TEST_RUN_TEST_RELOCATE_NO_PATCHOAT = _getEnvBoolean('ART_TEST_RUN_TEST_RELOCATE_NO_PATCHOAT',
- ART_TEST_FULL)
-
-# Do you want run-tests without a dex2oat?
-ART_TEST_RUN_TEST_NO_DEX2OAT = _getEnvBoolean('ART_TEST_RUN_TEST_NO_DEX2OAT', ART_TEST_FULL)
-
-# Do you want run-tests with libartd.so?
-ART_TEST_RUN_TEST_DEBUG = _getEnvBoolean('ART_TEST_RUN_TEST_DEBUG', ART_TEST_FULL)
-
-# Do you want run-tests with libart.so?
-ART_TEST_RUN_TEST_NDEBUG = _getEnvBoolean('ART_TEST_RUN_TEST_NDEBUG', ART_TEST_FULL)
-
# Do you want failed tests to have their artifacts cleaned up?
ART_TEST_RUN_TEST_ALWAYS_CLEAN = _getEnvBoolean('ART_TEST_RUN_TEST_ALWAYS_CLEAN', True)
-# Do you want run-tests with the --debuggable flag
-ART_TEST_RUN_TEST_DEBUGGABLE = _getEnvBoolean('ART_TEST_RUN_TEST_DEBUGGABLE', ART_TEST_FULL)
-
-# Do you want to test multi-part boot-image functionality?
-ART_TEST_RUN_TEST_MULTI_IMAGE = _getEnvBoolean('ART_TEST_RUN_TEST_MULTI_IMAGE', ART_TEST_FULL)
-
-ART_TEST_DEBUG_GC = _getEnvBoolean('ART_TEST_DEBUG_GC', False)
-
ART_TEST_BISECTION = _getEnvBoolean('ART_TEST_BISECTION', False)
DEX2OAT_HOST_INSTRUCTION_SET_FEATURES = _env.get('DEX2OAT_HOST_INSTRUCTION_SET_FEATURES')
@@ -217,8 +147,6 @@
# Note: ART_2ND_PHONY_TEST_HOST_SUFFIX is 2ND_ART_PHONY_HOST_TARGET_SUFFIX in .mk files
# Python does not let us have variable names starting with a digit, so it has differ.
-ART_TEST_RUN_TEST_JVMTI_STRESS = _getEnvBoolean('ART_TEST_RUN_TEST_JVMTI_STRESS', ART_TEST_FULL)
-
if TARGET_2ND_ARCH:
if "64" in TARGET_ARCH:
ART_PHONY_TEST_TARGET_SUFFIX = "64"
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 5f4108a..dcb768a 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -168,26 +168,9 @@
_user_input_variants['target'].add('host')
_user_input_variants['target'].add('target')
- if env.ART_TEST_RUN_TEST_NO_PREBUILD:
- _user_input_variants['prebuild'].add('no-prebuild')
- if env.ART_TEST_RUN_TEST_NO_DEX2OAT:
- _user_input_variants['prebuild'].add('no-dex2oat')
- if env.ART_TEST_RUN_TEST_PREBUILD or not _user_input_variants['prebuild']: # Default
+ if not _user_input_variants['prebuild']: # Default
_user_input_variants['prebuild'].add('prebuild')
- if env.ART_TEST_INTERPRETER_ACCESS_CHECKS:
- _user_input_variants['compiler'].add('interp-ac')
- if env.ART_TEST_INTERPRETER:
- _user_input_variants['compiler'].add('interpreter')
- if env.ART_TEST_JIT:
- _user_input_variants['compiler'].add('jit')
- if env.ART_TEST_OPTIMIZING_GRAPH_COLOR:
- _user_input_variants['compiler'].add('regalloc_gc')
- if env.ART_TEST_OPTIMIZING:
- _user_input_variants['compiler'].add('optimizing')
- if env.ART_TEST_SPEED_PROFILE:
- _user_input_variants['compiler'].add('speed-profile')
-
# By default only run without jvmti
if not _user_input_variants['jvmti']:
_user_input_variants['jvmti'].add('no-jvmti')
@@ -200,54 +183,31 @@
_user_input_variants['compiler'].add('interp-ac')
_user_input_variants['compiler'].add('speed-profile')
- if env.ART_TEST_RUN_TEST_RELOCATE:
- _user_input_variants['relocate'].add('relocate')
- if env.ART_TEST_RUN_TEST_RELOCATE_NO_PATCHOAT:
- _user_input_variants['relocate'].add('relocate-npatchoat')
if not _user_input_variants['relocate']: # Default
_user_input_variants['relocate'].add('no-relocate')
- if env.ART_TEST_TRACE:
- _user_input_variants['trace'].add('trace')
- if env.ART_TEST_TRACE_STREAM:
- _user_input_variants['trace'].add('stream')
if not _user_input_variants['trace']: # Default
_user_input_variants['trace'].add('ntrace')
- if env.ART_TEST_GC_STRESS:
- _user_input_variants['gc'].add('gcstress')
- if env.ART_TEST_GC_VERIFY:
- _user_input_variants['gc'].add('gcverify')
if not _user_input_variants['gc']: # Default
_user_input_variants['gc'].add('cms')
- if env.ART_TEST_JNI_FORCECOPY:
- _user_input_variants['jni'].add('forcecopy')
if not _user_input_variants['jni']: # Default
_user_input_variants['jni'].add('checkjni')
- if env.ART_TEST_RUN_TEST_NO_IMAGE:
- _user_input_variants['image'].add('no-image')
- if env.ART_TEST_RUN_TEST_MULTI_IMAGE:
- _user_input_variants['image'].add('multipicimage')
- if env.ART_TEST_RUN_TEST_IMAGE or not _user_input_variants['image']: # Default
+ if not _user_input_variants['image']: # Default
_user_input_variants['image'].add('picimage')
- if env.ART_TEST_PIC_TEST:
- _user_input_variants['pictest'].add('pictest')
+
if not _user_input_variants['pictest']: # Default
_user_input_variants['pictest'].add('npictest')
- if env.ART_TEST_RUN_TEST_NDEBUG:
- _user_input_variants['run'].add('ndebug')
- if env.ART_TEST_RUN_TEST_DEBUG or not _user_input_variants['run']: # Default
- _user_input_variants['run'].add('debug')
-
- if env.ART_TEST_RUN_TEST_DEBUGGABLE:
- _user_input_variants['debuggable'].add('debuggable')
if not _user_input_variants['debuggable']: # Default
_user_input_variants['debuggable'].add('ndebuggable')
+ if not _user_input_variants['run']: # Default
+ _user_input_variants['run'].add('debug')
+
_user_input_variants['address_sizes_target'] = collections.defaultdict(set)
if not _user_input_variants['address_sizes']:
_user_input_variants['address_sizes_target']['target'].add(
@@ -301,7 +261,7 @@
options_all = ''
global total_test_count
total_test_count = len(tests)
- for variant_type in _user_input_variants:
+ for variant_type in VARIANT_TYPE_DICT:
if not (variant_type == 'target' or 'address_sizes' in variant_type):
total_test_count *= len(_user_input_variants[variant_type])
target_address_combinations = 0
