test: More javac/dx fixes
Fix 3 more javac/dx tests that were being built incorrectly.
9 broken tests remaining.
Test: ANDROID_COMPILE_WITH_JACK=false art/test.py
Bug: 36902714
Change-Id: I0fbd5e82797911c7c5a8e075ffee23d0025d5d3f
diff --git a/test/580-checker-string-fact-intrinsics/src/Main.java b/test/580-checker-string-fact-intrinsics/src-art/Main.java
similarity index 100%
rename from test/580-checker-string-fact-intrinsics/src/Main.java
rename to test/580-checker-string-fact-intrinsics/src-art/Main.java
diff --git a/test/616-cha-interface-default/build b/test/616-cha-interface-default/build
new file mode 100644
index 0000000..d9654f8
--- /dev/null
+++ b/test/616-cha-interface-default/build
@@ -0,0 +1,17 @@
+#!/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.
+
+./default-build "$@" --experimental default-methods
diff --git a/test/etc/default-build b/test/etc/default-build
index 977b071..85350ba 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -349,7 +349,7 @@
if [ "${HAS_SRC_MULTIDEX}" = "true" ]; then
mkdir classes2
- ${JAVAC} -implicit:none -classpath src -d classes2 `find src-multidex -name '*.java'`
+ ${JAVAC} ${JAVAC_ARGS} -implicit:none -classpath src -d classes2 `find src-multidex -name '*.java'`
if [ ${NEED_DEX} = "true" ]; then
make_dex classes2
fi
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 3a211bd..614a258 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -599,13 +599,10 @@
"004-ReferenceMap",
"004-StackWalk",
"089-many-methods",
- "580-checker-string-fact-intrinsics",
- "616-cha-interface-default",
"636-wrong-static-access",
"910-methods",
"911-get-stack-trace",
"913-heaps",
- "948-change-annotations",
"953-invoke-polymorphic-compiler",
"958-methodhandle-stackframe"
],