Revert^2 "Disable test 567 and 913 until fixed"

fad7fd9411b5098bf7ac5a554251dc5cae41d234

Change-Id: Ia5aa3112cc52136de341efe156c46f343775fa74

4 files changed, 10 insertions, 10 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5cbbd4c968..7293be78de 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -905,9 +905,6 @@
       "name": "art-run-test-566-checker-codegen-select[com.google.android.art.apex]"
     },
     {
-      "name": "art-run-test-567-checker-builder-intrinsics[com.google.android.art.apex]"
-    },
-    {
       "name": "art-run-test-568-checker-onebit[com.google.android.art.apex]"
     },
     {
@@ -2215,9 +2212,6 @@
       "name": "art-run-test-566-checker-codegen-select"
     },
     {
-      "name": "art-run-test-567-checker-builder-intrinsics"
-    },
-    {
       "name": "art-run-test-568-checker-onebit"
     },
     {
@@ -3522,9 +3516,6 @@
       "name": "art-run-test-566-checker-codegen-select"
     },
     {
-      "name": "art-run-test-567-checker-builder-intrinsics"
-    },
-    {
       "name": "art-run-test-568-checker-onebit"
     },
     {
diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp
index 5bf3c030c7..2768bc9a33 100644
--- a/test/567-checker-builder-intrinsics/Android.bp
+++ b/test/567-checker-builder-intrinsics/Android.bp
@@ -15,7 +15,7 @@ package {
 java_test {
     name: "art-run-test-567-checker-builder-intrinsics",
     defaults: ["art-run-test-defaults"],
-    test_config_template: ":art-run-test-target-template",
+    test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
     data: [
         ":art-run-test-567-checker-builder-intrinsics-expected-stdout",
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 8983d04af8..4946cc140d 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -414,6 +414,13 @@
         "variant": "jvmti-stress | redefine-stress"
     },
     {
+        "tests": [ "567-checker-builder-intrinsics",
+                   "913-heaps" ],
+        "description": ["Problems with constant range."],
+        "bug": "http://b/238404145",
+        "variant": "optimizing | host"
+    },
+    {
         "test_patterns": ["[0-9]*-checker-.*"],
         "description": ["Checker tests are not compatible with jvmti."],
         "variant": "jvmti-stress | redefine-stress | trace-stress | field-stress | step-stress"
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 481b9ba57d..6d1330ce91 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -159,6 +159,7 @@ known_failing_tests = frozenset([
   "497-inlining-and-class-loader",
   "530-regression-lse",
   "555-UnsafeGetLong-regression",
+  "567-checker-builder-intrinsics", # b/238404145
   # 596-monitor-inflation: Dependency on `libarttest`.
   "596-monitor-inflation",
   "602-deoptimizeable",
@@ -205,6 +206,7 @@ known_failing_tests = frozenset([
   "832-cha-recursive",
   # 837-deopt: Dependency on `libarttest`.
   "837-deopt",
+  "913-heaps", # b/238404145
 ])
 
 known_failing_on_hwasan_tests = frozenset([