commit 7ff53f880f8b17c576924b3b1c4cba7381335444
author Mathieu Chartier <mathieuc@google.com> Fri Dec 15 23:05:02 2017 +0000
committer Mathieu Chartier <mathieuc@google.com> Fri Dec 15 23:05:30 2017 +0000
tree 71a162eed854beea4e60e32c6c12a13b90be7cc8
parent 8a34abcb8a74ecda146af761b390de753092da36

Revert "Move art-heap-poisoning and art-gtest-ss-gc to test cdex"

This reverts commit 8a34abcb8a74ecda146af761b390de753092da36.

Reason for revert: Gtests broken, working on it.

Bug: 63756964
Change-Id: Ie3eab9df68035090be875c04cf1a69ea94e1314d

test/testrunner/target_config.py

diff --git a/test/testrunner/target_config.py b/test/testrunner/target_config.py
index 297ce08..6d21442 100644
--- a/test/testrunner/target_config.py
+++ b/test/testrunner/target_config.py
@@ -229,13 +229,10 @@
     },
     'art-heap-poisoning' : {
         'run-test' : ['--interpreter',
-                      '--optimizing',
-                      '--cdex-fast'],
+                      '--optimizing'],
         'env' : {
             'ART_USE_READ_BARRIER' : 'false',
-            'ART_HEAP_POISONING' : 'true',
-            # Get some extra automated testing coverage for compact dex.
-            'ART_DEFAULT_COMPACT_DEX_LEVEL' : 'fast'
+            'ART_HEAP_POISONING' : 'true'
         }
     },
     'art-preopt' : {
@@ -279,9 +276,7 @@
         'make' :  'test-art-host-gtest',
         'env': {
             'ART_DEFAULT_GC_TYPE' : 'SS',
-            'ART_USE_READ_BARRIER' : 'false',
-            # Get some extra automated testing coverage for compact dex.
-            'ART_DEFAULT_COMPACT_DEX_LEVEL' : 'fast'
+            'ART_USE_READ_BARRIER' : 'false'
         }
     },
     'art-gtest-gss-gc': {