Merge "Move the art-gtest-heap-poisoning from Valgrind to ASan."

1 files changed, 13 insertions, 11 deletions

diff --git a/test/testrunner/target_config.py b/test/testrunner/target_config.py
index 414e3e5037..3064c76ffd 100644
--- a/test/testrunner/target_config.py
+++ b/test/testrunner/target_config.py
@@ -327,27 +327,20 @@ target_config = {
             'ART_USE_READ_BARRIER' : 'false'
         }
     },
-    'art-gtest-heap-poisoning': {
-        'make' : 'valgrind-test-art-host64',
-        'env' : {
-            'ART_HEAP_POISONING' : 'true',
-            'ART_USE_READ_BARRIER' : 'false'
-        }
-    },
 
    # 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
 
-   'art-gtest-asan': {
+    'art-gtest-asan': {
         'make' : 'test-art-host-gtest',
         'env': {
             'SANITIZE_HOST' : 'address',
             'ASAN_OPTIONS' : 'detect_leaks=0'
         }
-   },
-   'art-asan': {
+    },
+    'art-asan': {
         'run-test' : ['--interpreter',
                       '--optimizing',
                       '--jit'],
@@ -355,7 +348,16 @@ target_config = {
             'SANITIZE_HOST' : 'address',
             'ASAN_OPTIONS' : 'detect_leaks=0'
         }
-   },
+    },
+    'art-gtest-heap-poisoning': {
+        'make' : 'test-art-host-gtest',
+        'env' : {
+            'ART_HEAP_POISONING' : 'true',
+            'ART_USE_READ_BARRIER' : 'false',
+            'SANITIZE_HOST' : 'address',
+            'ASAN_OPTIONS' : 'detect_leaks=0'
+        }
+    },
 
    # 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),