test: Fix javac/dx run-test regressions from adding desugar

Fixes 4 tests for javac/dx build. 38 broken tests remaining.

Test: ANDROID_COMPILE_WITH_JACK=false art/test.py
Bug: 36902714
Change-Id: Ib879bdb02a7c3eb640fc929a0c2da1a14838cb35

3 files changed, 28 insertions, 4 deletions

diff --git a/test/065-mismatched-implements/build b/test/065-mismatched-implements/build
new file mode 100755
index 0000000000..41823b5025
--- /dev/null
+++ b/test/065-mismatched-implements/build
@@ -0,0 +1,27 @@
+#!/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.
+# Make us exit on a failure.
+
+set -e
+
+# Don't use desugar because the build fails when it encounters ICCE.
+#
+# Exception in thread "main" java.lang.IllegalArgumentException
+#  at com.google.common.base.Preconditions.checkArgument(Preconditions.java:108)
+#  at com.google.devtools.build.android.desugar.DefaultMethodClassFixer$DefaultMethodFinder.visit(DefaultMethodClassFixer.java:295)
+export USE_DESUGAR=false
+
+./default-build "$@"
diff --git a/test/etc/default-build b/test/etc/default-build
index ba413ecb85..082772f44e 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -262,6 +262,7 @@ if [ ${HAS_SRC_DEX2OAT_UNRESOLVED} = "true" ]; then
   else
     if [ ${NEED_DEX} = "true" ]; then
       make_dex classes-ex
+      mv classes-ex.dex classes.dex   # rename it so it shows up as "classes.dex" in the zip file.
       zip ${TEST_NAME}-ex.jar classes.dex
       make_dex classes
     fi
diff --git a/test/knownfailures.json b/test/knownfailures.json
index b7f5d4ca48..f3e9ab02e1 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -601,22 +601,18 @@
             "004-ReferenceMap",
             "004-StackWalk",
             "048-reflect-v8",
-            "065-mismatched-implements",
             "089-many-methods",
             "138-duplicate-classes-check",
             "146-bad-interface",
             "157-void-class",
-            "529-checker-unresolved",
             "563-checker-invoke-super",
             "580-checker-string-fact-intrinsics",
             "596-monitor-inflation",
             "604-hot-static-interface",
-            "608-checker-unresolved-lse",
             "612-jit-dex-cache",
             "613-inlining-dex-cache",
             "616-cha-interface-default",
             "636-wrong-static-access",
-            "648-inline-caches-unresolved",
             "909-attach-agent",
             "910-methods",
             "911-get-stack-trace",