10 files changed, 0 insertions, 150 deletions
diff --git a/test/172-app-image-twice/check b/test/172-app-image-twice/check
deleted file mode 100755
index 26a97a48ae..0000000000
--- a/test/172-app-image-twice/check
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 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.
-
-# Remove all lines not containing "passed".
-grep "^passed" "$2" | diff --strip-trailing-cr -q "$1" - >/dev/null
diff --git a/test/172-app-image-twice/debug_print_class.cc b/test/172-app-image-twice/debug_print_class.cc
deleted file mode 100644
index 6c3de20f2d..0000000000
--- a/test/172-app-image-twice/debug_print_class.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-#include "debug_print.h"
-#include "dex/dex_file.h"
-#include "mirror/class-inl.h"
-#include "scoped_thread_state_change-inl.h"
-#include "thread-current-inl.h"
-
-namespace art {
-
-extern "C" JNIEXPORT void JNICALL Java_Main_debugPrintClass(JNIEnv*, jclass, jclass cls) {
-  ScopedObjectAccess soa(Thread::Current());
-  ObjPtr<mirror::Class> klass = soa.Decode<mirror::Class>(cls);
-  LOG(ERROR) << "klass: " << klass.Ptr() << " dex_file: " << klass->GetDexFile().GetLocation()
-      << "/" << static_cast<const void*>(&klass->GetDexFile())
-      << " " << DescribeSpace(klass);
-}
-
-}  // namespace art
diff --git a/test/172-app-image-twice/expected.txt b/test/172-app-image-twice/expected.txt
deleted file mode 100644
index b0aad4deb5..0000000000
--- a/test/172-app-image-twice/expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-passed
diff --git a/test/172-app-image-twice/info.txt b/test/172-app-image-twice/info.txt
deleted file mode 100644
index 028046e872..0000000000
--- a/test/172-app-image-twice/info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Regression test for loading the same app image twice.
diff --git a/test/172-app-image-twice/profile b/test/172-app-image-twice/profile
deleted file mode 100644
index 70cb2efbb5..0000000000
--- a/test/172-app-image-twice/profile
+++ /dev/null
@@ -1 +0,0 @@
-LTestClass;
diff --git a/test/172-app-image-twice/run b/test/172-app-image-twice/run
deleted file mode 100644
index aa2819075f..0000000000
--- a/test/172-app-image-twice/run
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 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.
-
-# Build an app image with TestClass (specified by profile) and class loader
-# context that skips the duplicate class checks.
-
-# Target and host use a different shell, and we need to special case the
-# passing of the class loader context marker.
-if [[ "$@" = *" --host "* ]]; then
-  ${RUN} $@ --profile -Xcompiler-option --compiler-filter=speed-profile \
-      -Xcompiler-option --class-loader-context=\&
-else
-  ${RUN} $@ --profile -Xcompiler-option --compiler-filter=speed-profile \
-      -Xcompiler-option '--class-loader-context=\&'
-fi
diff --git a/test/172-app-image-twice/src/Main.java b/test/172-app-image-twice/src/Main.java
deleted file mode 100644
index a1c151a6bc..0000000000
--- a/test/172-app-image-twice/src/Main.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-import java.lang.reflect.Method;
-
-public class Main {
-    private static String TEST_NAME = "172-app-image-twice";
-
-    public static void main(String args[]) throws Exception {
-        System.loadLibrary(args[0]);
-
-        Class<?> tc1 = Class.forName("TestClass");
-
-        String dexPath = System.getenv("DEX_LOCATION") + "/" + TEST_NAME + ".jar";
-        Class<?> bdcl = Class.forName("dalvik.system.BaseDexClassLoader");
-        Method addDexPathMethod = bdcl.getDeclaredMethod("addDexPath", String.class);
-        addDexPathMethod.invoke(Main.class.getClassLoader(), dexPath);
-
-        Class<?> tc2 = Class.forName("TestClass");
-
-        // Add extra logging to simulate libcore logging, this logging should not be compared
-        // against.
-        System.out.println("Extra logging");
-
-        if (tc1 != tc2) {
-            System.out.println("Class mismatch!");
-            debugPrintClass(tc1);
-            debugPrintClass(tc2);
-        } else {
-            System.out.println("passed");
-        }
-    }
-
-    public static native void debugPrintClass(Class<?> cls);
-}
diff --git a/test/172-app-image-twice/src/TestClass.java b/test/172-app-image-twice/src/TestClass.java
deleted file mode 100644
index 5381718f6e..0000000000
--- a/test/172-app-image-twice/src/TestClass.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-public class TestClass {
-}
diff --git a/test/Android.bp b/test/Android.bp
index 76189f62a9..0c6b449877 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -423,7 +423,6 @@ cc_defaults {
         "154-gc-loop/heap_interface.cc",
         "167-visit-locks/visit_locks.cc",
         "169-threadgroup-jni/jni_daemon_thread.cc",
-        "172-app-image-twice/debug_print_class.cc",
         "1945-proxy-method-arguments/get_args.cc",
         "203-multi-checkpoint/multi_checkpoint.cc",
         "305-other-fault-handler/fault_handler.cc",
diff --git a/test/knownfailures.json b/test/knownfailures.json
index f473a99a27..f3137587f6 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -734,7 +734,6 @@
           "164-resolution-trampoline-dex-cache",
           "167-visit-locks",
           "168-vmstack-annotated",
-          "172-app-image-twice",
           "201-built-in-except-detail-messages",
           "203-multi-checkpoint",
           "304-method-tracing",