[art] Expand test coverage of secondary app images
This CL introduces a new test that verifies loading secondary app images
into a classloader that has already been initialized works as expected.
Test: ./test/testrunner/testrunner.py -b --host -t 597-app-images-same-classloader
Bug: 149098478
Change-Id: If06f4c286e090569821d77d26f7fffce50473614
Change-Id: I6cff0c8f2fd8e40546d28674c0324cb11a29bbf7
diff --git a/test/597-app-images-same-classloader/expected.txt b/test/597-app-images-same-classloader/expected.txt
new file mode 100644
index 0000000..ff3be57
--- /dev/null
+++ b/test/597-app-images-same-classloader/expected.txt
@@ -0,0 +1,2 @@
+JNI_OnLoad called
+Secondary went
diff --git a/test/597-app-images-same-classloader/info.txt b/test/597-app-images-same-classloader/info.txt
new file mode 100644
index 0000000..38f6e70
--- /dev/null
+++ b/test/597-app-images-same-classloader/info.txt
@@ -0,0 +1,2 @@
+Tests that loading an app image into an already existent classloader works if
+the classloader context is correct.
diff --git a/test/597-app-images-same-classloader/profile b/test/597-app-images-same-classloader/profile
new file mode 100644
index 0000000..c7406e2
--- /dev/null
+++ b/test/597-app-images-same-classloader/profile
@@ -0,0 +1,2 @@
+LMain;
+LSecondary;
diff --git a/test/597-app-images-same-classloader/run b/test/597-app-images-same-classloader/run
new file mode 100644
index 0000000..496273f
--- /dev/null
+++ b/test/597-app-images-same-classloader/run
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# Copyright (C) 2020 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.
+
+# We need a profile to tell dex2oat to include classes in the final app image
+exec ${RUN} --profile --secondary-class-loader-context "PCL[$DEX_LOCATION/$TEST_NAME.jar]" $@
diff --git a/test/597-app-images-same-classloader/src-art/Main.java b/test/597-app-images-same-classloader/src-art/Main.java
new file mode 100644
index 0000000..96a902c
--- /dev/null
+++ b/test/597-app-images-same-classloader/src-art/Main.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 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 dalvik.system.PathClassLoader;
+
+class Main {
+ static final String TEST_NAME = "597-app-images-same-classloader";
+
+ static final String DEX_FILE = System.getenv("DEX_LOCATION") + "/" + TEST_NAME + ".jar";
+ static final String LIBRARY_SEARCH_PATH = System.getProperty("java.library.path");
+
+ static final String SECONDARY_NAME = TEST_NAME + "-ex";
+ static final String SECONDARY_DEX_FILE =
+ System.getenv("DEX_LOCATION") + "/" + SECONDARY_NAME + ".jar";
+
+ public static void main(String[] args) throws Exception {
+ System.loadLibrary(args[0]);
+
+ testLoadingSecondaryAppImageInLoadedClassLoader();
+ }
+
+ public static native boolean checkAppImageLoaded(String name);
+ public static native boolean checkAppImageContains(Class<?> klass);
+ public static native boolean checkInitialized(Class<?> klass);
+
+ public static void testLoadingSecondaryAppImageInLoadedClassLoader() throws Exception {
+ // Sanity check that the image isn't already loaded so we don't get bogus results below
+ assertFalse("Secondary app image isn't already loaded",
+ checkAppImageLoaded(SECONDARY_NAME));
+
+ PathClassLoader pcl = new PathClassLoader(DEX_FILE, LIBRARY_SEARCH_PATH, null);
+ pcl.addDexPath(SECONDARY_DEX_FILE);
+
+ assertTrue("Ensure app image is loaded if it should be",
+ checkAppImageLoaded(SECONDARY_NAME));
+
+ Class<?> secondaryCls = pcl.loadClass("Secondary");
+ assertTrue("Ensure Secondary class is in the app image",
+ checkAppImageContains(secondaryCls));
+ assertTrue("Ensure Secondary class is preinitialized", checkInitialized(secondaryCls));
+
+ secondaryCls.getDeclaredMethod("go").invoke(null);
+ }
+
+ private static void assertTrue(String message, boolean flag) {
+ if (flag) {
+ return;
+ }
+ throw new AssertionError(message);
+ }
+
+ private static void assertFalse(String message, boolean flag) {
+ assertTrue(message, !flag);
+ }
+}
diff --git a/test/597-app-images-same-classloader/src-ex/Secondary.java b/test/597-app-images-same-classloader/src-ex/Secondary.java
new file mode 100644
index 0000000..36eee88
--- /dev/null
+++ b/test/597-app-images-same-classloader/src-ex/Secondary.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2020 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 Secondary {
+ public static void go() {
+ System.out.println("Secondary went");
+ }
+}
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 34856a1..d4d279c 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -308,6 +308,11 @@
"variant": "interp-ac"
},
{
+ "tests": "597-app-images-same-classloader",
+ "description": "not generated when using the access check configuration",
+ "variant": "interp-ac"
+ },
+ {
"tests": "055-enum-performance",
"variant": "optimizing | regalloc_gc",
"description": ["055: Exceeds run time limits due to heap poisoning ",