Disable D8 for a subset of the tests
Instead of using D8 for those tests, we will continue to run them
with DX instead.
Keep in mind that as long as D8 is not default yet. This CL is
no-op for every build.
Bug: 65168732, 65850560, 65203529
Test: USE_D8=true ANDROID_COMPILE_WITH_JACK=false art/test.py -j20 --host -b
For 65168732:
*-checker-*/build
For 65850560:
910-methods/build
911-get-stack-trace/build
913-heaps/build
For 65203529:
1929-exception-catch-exception/build
Change-Id: I281b013dd93e10dfde0731d05b8d662232861ba5
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 571c91a..0f92a25 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -604,7 +604,7 @@
endif
.PHONY: $$(rule_name)
-$$(rule_name): $$(dependencies)
+$$(rule_name): $$(dependencies) dx d8
$(hide) $$(call ART_TEST_PREREQ_FINISHED,$$@)
# Clear locally defined variables.
diff --git a/test/1929-exception-catch-exception/build b/test/1929-exception-catch-exception/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/1929-exception-catch-exception/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/442-checker-constant-folding/build b/test/442-checker-constant-folding/build
index 49292c9..947ec9a 100755
--- a/test/442-checker-constant-folding/build
+++ b/test/442-checker-constant-folding/build
@@ -20,4 +20,7 @@
# Also disable desugar because it is missing in jack platform builds.
export DESUGAR=false
+# See b/65168732
+export DX=$ANDROID_HOST_OUT/bin/dx
+
./default-build "$@"
diff --git a/test/450-checker-types/build b/test/450-checker-types/build
index 49292c9..947ec9a 100755
--- a/test/450-checker-types/build
+++ b/test/450-checker-types/build
@@ -20,4 +20,7 @@
# Also disable desugar because it is missing in jack platform builds.
export DESUGAR=false
+# See b/65168732
+export DX=$ANDROID_HOST_OUT/bin/dx
+
./default-build "$@"
diff --git a/test/458-checker-instruct-simplification/build b/test/458-checker-instruct-simplification/build
index 49292c9..947ec9a 100755
--- a/test/458-checker-instruct-simplification/build
+++ b/test/458-checker-instruct-simplification/build
@@ -20,4 +20,7 @@
# Also disable desugar because it is missing in jack platform builds.
export DESUGAR=false
+# See b/65168732
+export DX=$ANDROID_HOST_OUT/bin/dx
+
./default-build "$@"
diff --git a/test/463-checker-boolean-simplifier/build b/test/463-checker-boolean-simplifier/build
index 49292c9..947ec9a 100755
--- a/test/463-checker-boolean-simplifier/build
+++ b/test/463-checker-boolean-simplifier/build
@@ -20,4 +20,7 @@
# Also disable desugar because it is missing in jack platform builds.
export DESUGAR=false
+# See b/65168732
+export DX=$ANDROID_HOST_OUT/bin/dx
+
./default-build "$@"
diff --git a/test/476-checker-ctor-fence-redun-elim/build b/test/476-checker-ctor-fence-redun-elim/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/476-checker-ctor-fence-redun-elim/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/482-checker-loop-back-edge-use/build b/test/482-checker-loop-back-edge-use/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/482-checker-loop-back-edge-use/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/484-checker-register-hints/build b/test/484-checker-register-hints/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/484-checker-register-hints/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/530-checker-lse/build b/test/530-checker-lse/build
new file mode 100755
index 0000000..42b99ad
--- /dev/null
+++ b/test/530-checker-lse/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/536-checker-intrinsic-optimization/build b/test/536-checker-intrinsic-optimization/build
index 49292c9..947ec9a 100755
--- a/test/536-checker-intrinsic-optimization/build
+++ b/test/536-checker-intrinsic-optimization/build
@@ -20,4 +20,7 @@
# Also disable desugar because it is missing in jack platform builds.
export DESUGAR=false
+# See b/65168732
+export DX=$ANDROID_HOST_OUT/bin/dx
+
./default-build "$@"
diff --git a/test/549-checker-types-merge/build b/test/549-checker-types-merge/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/549-checker-types-merge/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/565-checker-doublenegbitwise/build b/test/565-checker-doublenegbitwise/build
index 49292c9..947ec9a 100755
--- a/test/565-checker-doublenegbitwise/build
+++ b/test/565-checker-doublenegbitwise/build
@@ -20,4 +20,7 @@
# Also disable desugar because it is missing in jack platform builds.
export DESUGAR=false
+# See b/65168732
+export DX=$ANDROID_HOST_OUT/bin/dx
+
./default-build "$@"
diff --git a/test/565-checker-rotate/build b/test/565-checker-rotate/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/565-checker-rotate/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/566-checker-signum/build b/test/566-checker-signum/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/566-checker-signum/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/567-checker-compare/build b/test/567-checker-compare/build
new file mode 100644
index 0000000..1d269dc
--- /dev/null
+++ b/test/567-checker-compare/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/570-checker-osr/build b/test/570-checker-osr/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/570-checker-osr/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/586-checker-null-array-get/build b/test/586-checker-null-array-get/build
index 49292c9..947ec9a 100755
--- a/test/586-checker-null-array-get/build
+++ b/test/586-checker-null-array-get/build
@@ -20,4 +20,7 @@
# Also disable desugar because it is missing in jack platform builds.
export DESUGAR=false
+# See b/65168732
+export DX=$ANDROID_HOST_OUT/bin/dx
+
./default-build "$@"
diff --git a/test/593-checker-boolean-2-integral-conv/build b/test/593-checker-boolean-2-integral-conv/build
index 49292c9..947ec9a 100755
--- a/test/593-checker-boolean-2-integral-conv/build
+++ b/test/593-checker-boolean-2-integral-conv/build
@@ -20,4 +20,7 @@
# Also disable desugar because it is missing in jack platform builds.
export DESUGAR=false
+# See b/65168732
+export DX=$ANDROID_HOST_OUT/bin/dx
+
./default-build "$@"
diff --git a/test/611-checker-simplify-if/build b/test/611-checker-simplify-if/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/611-checker-simplify-if/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/618-checker-induction/build b/test/618-checker-induction/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/618-checker-induction/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/624-checker-stringops/build b/test/624-checker-stringops/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/624-checker-stringops/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/910-methods/build b/test/910-methods/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/910-methods/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/911-get-stack-trace/build b/test/911-get-stack-trace/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/911-get-stack-trace/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"
diff --git a/test/913-heaps/build b/test/913-heaps/build
new file mode 100644
index 0000000..42b99ad
--- /dev/null
+++ b/test/913-heaps/build
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 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 DX=$ANDROID_HOST_OUT/bin/dx
+
+./default-build "$@"