ART-tests: remove DX dependency from 672/673
In some test cases D8 inverts an IF condition compared to the code
generated by DX and the corresponding checks fail. This CL updates
the checks for D8 and enables it.
Test: art/test.py -b -r --host -t 672-checker-throw-method
Test: art/test.py -b -r --host -t 673-checker-throw-vmethod
Bug: 65168732
Change-Id: I8beeedfa662e35f918701fb59955b6f93bb47686
diff --git a/test/672-checker-throw-method/build b/test/672-checker-throw-method/build
deleted file mode 100644
index d85147f..0000000
--- a/test/672-checker-throw-method/build
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# See b/65168732
-export USE_D8=false
-
-./default-build "$@"
diff --git a/test/672-checker-throw-method/src/Main.java b/test/672-checker-throw-method/src/Main.java
index a507133..360b52c 100644
--- a/test/672-checker-throw-method/src/Main.java
+++ b/test/672-checker-throw-method/src/Main.java
@@ -51,7 +51,7 @@
/// CHECK-START: void Main.doit1(int[]) code_sinking (before)
/// CHECK: begin_block
/// CHECK: <<Str:l\d+>> LoadString
- /// CHECK: <<Tst:z\d+>> NotEqual
+ /// CHECK: <<Tst:z\d+>> Equal
/// CHECK: If [<<Tst>>]
/// CHECK: end_block
/// CHECK: begin_block
@@ -61,7 +61,7 @@
//
/// CHECK-START: void Main.doit1(int[]) code_sinking (after)
/// CHECK: begin_block
- /// CHECK: <<Tst:z\d+>> NotEqual
+ /// CHECK: <<Tst:z\d+>> Equal
/// CHECK: If [<<Tst>>]
/// CHECK: end_block
/// CHECK: begin_block
@@ -109,7 +109,7 @@
/// CHECK-START: void Main.doit3(int[]) code_sinking (before)
/// CHECK: begin_block
/// CHECK: <<Str:l\d+>> LoadString
- /// CHECK: <<Tst:z\d+>> NotEqual
+ /// CHECK: <<Tst:z\d+>> Equal
/// CHECK: If [<<Tst>>]
/// CHECK: end_block
/// CHECK: begin_block
@@ -119,7 +119,7 @@
//
/// CHECK-START: void Main.doit3(int[]) code_sinking (after)
/// CHECK: begin_block
- /// CHECK: <<Tst:z\d+>> NotEqual
+ /// CHECK: <<Tst:z\d+>> Equal
/// CHECK: If [<<Tst>>]
/// CHECK: end_block
/// CHECK: begin_block
diff --git a/test/673-checker-throw-vmethod/build b/test/673-checker-throw-vmethod/build
deleted file mode 100644
index d85147f..0000000
--- a/test/673-checker-throw-vmethod/build
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# See b/65168732
-export USE_D8=false
-
-./default-build "$@"
diff --git a/test/673-checker-throw-vmethod/src/Main.java b/test/673-checker-throw-vmethod/src/Main.java
index d0e1591..206dfaf 100644
--- a/test/673-checker-throw-vmethod/src/Main.java
+++ b/test/673-checker-throw-vmethod/src/Main.java
@@ -45,7 +45,7 @@
/// CHECK-START: void Main.doit1(int[]) code_sinking (before)
/// CHECK: begin_block
/// CHECK: <<Str:l\d+>> LoadString
- /// CHECK: <<Tst:z\d+>> NotEqual
+ /// CHECK: <<Tst:z\d+>> Equal
/// CHECK: If [<<Tst>>]
/// CHECK: end_block
/// CHECK: begin_block
@@ -55,7 +55,7 @@
//
/// CHECK-START: void Main.doit1(int[]) code_sinking (after)
/// CHECK: begin_block
- /// CHECK: <<Tst:z\d+>> NotEqual
+ /// CHECK: <<Tst:z\d+>> Equal
/// CHECK: If [<<Tst>>]
/// CHECK: end_block
/// CHECK: begin_block
@@ -103,7 +103,7 @@
/// CHECK-START: void Main.doit3(int[]) code_sinking (before)
/// CHECK: begin_block
/// CHECK: <<Str:l\d+>> LoadString
- /// CHECK: <<Tst:z\d+>> NotEqual
+ /// CHECK: <<Tst:z\d+>> Equal
/// CHECK: If [<<Tst>>]
/// CHECK: end_block
/// CHECK: begin_block
@@ -113,7 +113,7 @@
//
/// CHECK-START: void Main.doit3(int[]) code_sinking (after)
/// CHECK: begin_block
- /// CHECK: <<Tst:z\d+>> NotEqual
+ /// CHECK: <<Tst:z\d+>> Equal
/// CHECK: If [<<Tst>>]
/// CHECK: end_block
/// CHECK: begin_block