Clean up more test configurations (Part 1).

- Start to "rename" some configurations: make copies of these
  configurations under new names and tag the original
  configurations as to be deleted later (in a follow-up
  change), when they are no longer used:
  - Copy art-interpreter-gcstress as art-interpreter-gcstress-gcverify.
  - Copy art-optimizing-gcstress as art-optimizing-gcstress-gcverify.
  - Copy art-optimizing-gcstress as art-jit-gcstress-gcverify.
  - Copy art-read-barrier as art-read-barrier-heap-poisoning.
- Remove the following configurations, as they are disabled on
  our continuous testing infrastructure:
  - art-no-dex2oat
  - art-relocate-no-patchoat
- Tag the following configurations for a later removal:
  - art-read-barrier-gcstress
- Tag the following configurations for a potential later removal:
  - art-ss-gc
  - art-ss-gc-tlab
  - art-gtest-ss-gc
  - art-gtest-ss-gc-tlab
  - art-gss-gc
  - art-gss-gc-tlab
  - art-gtest-gss-gc
  - art-gtest-gss-gc-tlab

Also fix the indentation of the configuration file.

Test: art/test/testrunner/run_build_test_target.py art-interpreter-gcstress-gcverify
Test: art/test/testrunner/run_build_test_target.py art-optimizing-gcstress-gcverify
Test: art/test/testrunner/run_build_test_target.py art-jit-gcstress-gcverify
Test: art/test/testrunner/run_build_test_target.py art-read-barrier-heap-poisoning
Bug: 62611253
Change-Id: I91f99c3af78fdce276c7acbe2fe7b64154d9249d

1 files changed, 85 insertions, 42 deletions

diff --git a/test/testrunner/target_config.py b/test/testrunner/target_config.py
index 84490bf0e4..6f0d94172b 100644
--- a/test/testrunner/target_config.py
+++ b/test/testrunner/target_config.py
@@ -1,23 +1,23 @@
 target_config = {
 
-# Configuration syntax:
-#
-#   Required keys: (Use one or more of these)
-#    * golem - specify a golem machine-type to build, e.g. android-armv8
-#              (uses art/tools/golem/build-target.sh)
-#    * make - specify a make target to build, e.g. build-art-host
-#    * run-test - runs the tests in art/test/ directory with testrunner.py,
-#                 specify a list of arguments to pass to testrunner.py
-#
-#   Optional keys: (Use any of these)
-#    * env - Add additional environment variable to the current environment.
-#
-# *** IMPORTANT ***:
-#    This configuration is used by the android build server. Targets must not be renamed
-#    or removed.
-#
+    # Configuration syntax:
+    #
+    #   Required keys: (Use one or more of these)
+    #    * golem - specify a golem machine-type to build, e.g. android-armv8
+    #              (uses art/tools/golem/build-target.sh)
+    #    * make - specify a make target to build, e.g. build-art-host
+    #    * run-test - runs the tests in art/test/ directory with testrunner.py,
+    #                 specify a list of arguments to pass to testrunner.py
+    #
+    #   Optional keys: (Use any of these)
+    #    * env - Add additional environment variable to the current environment.
+    #
+    # *** IMPORTANT ***:
+    #    This configuration is used by the android build server. Targets must not be renamed
+    #    or removed.
+    #
 
-##########################################
+    ##########################################
 
     # General ART configurations.
     # Calls make and testrunner both.
@@ -56,26 +56,49 @@ target_config = {
     },
     'art-gcstress-gcverify': {
         # Do not exercise '--interpreter', '--optimizing', nor '--jit' in this
-        # configuration, as they are covered by the 'art-interpreter-gcstress',
-        # 'art-optimizing-gcstress' and 'art-jit-gcstress' configurations below.
+        # configuration, as they are covered by the
+        # 'art-interpreter-gcstress-gcverify',
+        # 'art-optimizing-gcstress-gcverify' and 'art-jit-gcstress-gcverify'
+        # configurations below.
         'run-test': ['--interp-ac',
                      '--speed-profile',
                      '--gcstress',
                      '--gcverify']
     },
-    # Rename this configuration as 'art-interpreter-gcstress-gcverify' (b/62611253).
+    'art-interpreter-gcstress-gcverify' : {
+        'run-test' : ['--interpreter',
+                      '--gcstress',
+                      '--gcverify']
+    },
+    # TODO: Remove this configuration (which is a duplicate of
+    # 'art-interpreter-gcstress-gcverify') when it is no longer used by any
+    # continuous testing target (b/62611253).
     'art-interpreter-gcstress' : {
         'run-test' : ['--interpreter',
                       '--gcstress',
                       '--gcverify']
     },
-    # Rename this configuration as 'art-optimizing-gcstress-gcverify' (b/62611253).
+    'art-optimizing-gcstress-gcverify' : {
+        'run-test' : ['--optimizing',
+                      '--gcstress',
+                      '--gcverify']
+    },
+    # TODO: Remove this configuration (which is a duplicate of
+    # 'art-optimizing-gcstress-gcverify') when it is no longer used by any
+    # continuous testing target (b/62611253).
     'art-optimizing-gcstress' : {
         'run-test' : ['--optimizing',
                       '--gcstress',
                       '--gcverify']
     },
-    # Rename this configuration as 'art-jit-gcstress-gcverify' (b/62611253).
+    'art-jit-gcstress-gcverify' : {
+        'run-test' : ['--jit',
+                      '--gcstress',
+                      '--gcverify']
+    },
+    # TODO: Remove this configuration (which is a duplicate of
+    # 'art-jit-gcstress-gcverify') when it is no longer used by any
+    # continuous testing target (b/62611253).
     'art-jit-gcstress' : {
         'run-test' : ['--jit',
                       '--gcstress',
@@ -86,18 +109,28 @@ target_config = {
                       '--gcstress',
                       '--runtime-option=-Xjitthreshold:0']
     },
-    # TODO: Rename or repurpose this configuration as
-    # 'art-read-barrier-heap-poisoning' (b/62611253).
+    'art-read-barrier-heap-poisoning' : {
+        'run-test': ['--interpreter',
+                     '--optimizing'],
+        'env' : {
+            'ART_HEAP_POISONING' : 'true'
+        }
+    },
+    # TODO: Remove this configuration (which is a duplicate of
+    # 'art-read-barrier-heap-poisoning') when it is no longer used by any
+    # continuous testing target (b/62611253).
     'art-read-barrier' : {
         'run-test': ['--interpreter',
-                  '--optimizing'],
+                     '--optimizing'],
         'env' : {
             'ART_HEAP_POISONING' : 'true'
         }
     },
-    # TODO: Remove or disable this configuration, as it is now covered
-    # by 'art-interpreter-gcstress' and 'art-optimizing-gcstress' --
-    # except for heap poisoning, but that's fine (b/62611253).
+    # TODO: Remove this configuration when it is no longer used by any
+    # continuous testing target (b/62611253). This configuration is scheduled
+    # for removal as it is now covered by 'art-interpreter-gcstress-gcverify'
+    # and 'art-optimizing-gcstress-gcverify' -- except for heap poisoning, but
+    # that's fine.
     'art-read-barrier-gcstress' : {
         'run-test' : ['--interpreter',
                       '--optimizing',
@@ -122,6 +155,9 @@ target_config = {
             'ART_USE_READ_BARRIER' : 'false'
         }
     },
+    # TODO: Consider removing this configuration when it is no longer used by
+    # any continuous testing target (b/62611253), as the SS collector overlaps
+    # with the CC collector, since both move objects.
     'art-ss-gc' : {
         'run-test' : ['--interpreter',
                       '--optimizing',
@@ -131,6 +167,7 @@ target_config = {
             'ART_USE_READ_BARRIER' : 'false'
         }
     },
+    # TODO: Remove this configuration (b/62611253) when the GSS collector is removed (b/73295078).
     'art-gss-gc' : {
         'run-test' : ['--interpreter',
                       '--optimizing',
@@ -140,6 +177,9 @@ target_config = {
             'ART_USE_READ_BARRIER' : 'false'
         }
     },
+    # TODO: Consider removing this configuration when it is no longer used by
+    # any continuous testing target (b/62611253), as the SS collector overlaps
+    # with the CC collector, since both move objects.
     'art-ss-gc-tlab' : {
         'run-test' : ['--interpreter',
                       '--optimizing',
@@ -150,6 +190,7 @@ target_config = {
             'ART_USE_READ_BARRIER' : 'false'
         }
     },
+    # TODO: Remove this configuration (b/62611253) when the GSS collector is removed (b/73295078).
     'art-gss-gc-tlab' : {
         'run-test' : ['--interpreter',
                       '--optimizing',
@@ -180,12 +221,6 @@ target_config = {
         'run-test' : ['--interpreter',
                       '--no-image']
     },
-    'art-relocate-no-patchoat' : {
-        'run-test' : ['--relocate-npatchoat']
-    },
-    'art-no-dex2oat' : {
-        # Deprecated configuration.
-    },
     'art-heap-poisoning' : {
         'run-test' : ['--interpreter',
                       '--optimizing',
@@ -226,6 +261,9 @@ target_config = {
             'ART_HEAP_POISONING' : 'true'
         }
     },
+    # TODO: Consider removing this configuration when it is no longer used by
+    # any continuous testing target (b/62611253), as the SS collector overlaps
+    # with the CC collector, since both move objects.
     'art-gtest-ss-gc': {
         'make' :  'test-art-host-gtest',
         'env': {
@@ -235,6 +273,7 @@ target_config = {
             'ART_DEFAULT_COMPACT_DEX_LEVEL' : 'none'
         }
     },
+    # TODO: Remove this configuration (b/62611253) when the GSS collector is removed (b/73295078).
     'art-gtest-gss-gc': {
         'make' :  'test-art-host-gtest',
         'env' : {
@@ -242,6 +281,9 @@ target_config = {
             'ART_USE_READ_BARRIER' : 'false'
         }
     },
+    # TODO: Consider removing this configuration when it is no longer used by
+    # any continuous testing target (b/62611253), as the SS collector overlaps
+    # with the CC collector, since both move objects.
     'art-gtest-ss-gc-tlab': {
         'make' :  'test-art-host-gtest',
         'env': {
@@ -250,6 +292,7 @@ target_config = {
             'ART_USE_READ_BARRIER' : 'false',
         }
     },
+    # TODO: Remove this configuration (b/62611253) when the GSS collector is removed (b/73295078).
     'art-gtest-gss-gc-tlab': {
         'make' :  'test-art-host-gtest',
         'env': {
@@ -273,10 +316,10 @@ target_config = {
         }
     },
 
-   # ASAN (host) configurations.
+    # ASAN (host) configurations.
 
-   # These configurations need detect_leaks=0 to work in non-setup environments like build bots,
-   # as our build tools leak. b/37751350
+    # These configurations need detect_leaks=0 to work in non-setup environments like build bots,
+    # as our build tools leak. b/37751350
 
     'art-gtest-asan': {
         'make' : 'test-art-host-gtest',
@@ -306,11 +349,11 @@ target_config = {
         }
     },
 
-   # ART Golem build targets used by go/lem (continuous ART benchmarking),
-   # (art-opt-cc is used by default since it mimics the default preopt config),
-   #
-   # calls golem/build-target.sh which builds a golem tarball of the target name,
-   #     e.g. 'golem: android-armv7' produces an 'android-armv7.tar.gz' upon success.
+    # ART Golem build targets used by go/lem (continuous ART benchmarking),
+    # (art-opt-cc is used by default since it mimics the default preopt config),
+    #
+    # calls golem/build-target.sh which builds a golem tarball of the target name,
+    #     e.g. 'golem: android-armv7' produces an 'android-armv7.tar.gz' upon success.
 
     'art-golem-android-armv7': {
         'golem' : 'android-armv7'