diff options
| author | Martin Stjernholm <mast@google.com> | 2019-10-24 16:57:34 +0100 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2019-11-13 17:50:14 +0000 |
| commit | 94fd9eaee76e862932dded6583a9c052e5aa9efc (patch) | |
| tree | 26638e055a87784bd4d05fac144f644a64a99320 /libnativeloader/native_loader_test.cpp | |
| parent | 149cddaa22a1a78e8dde179d2c33b745cb500629 (diff) | |
Use a different name for shared classloader namespace, to help debugging.
Test: atest libnativeloader_test
Bug: 130388701
Change-Id: I6dbb53cac7fb7ac8fb5178611a164c83c2ab59ba
Diffstat (limited to 'libnativeloader/native_loader_test.cpp')
| -rw-r--r-- | libnativeloader/native_loader_test.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index 7fdb0c08e3..8a8193ed7d 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -24,6 +24,7 @@ #include <jni.h> #include "native_loader_namespace.h" +#include "nativehelper/scoped_utf_chars.h" #include "nativeloader/dlext_namespaces.h" #include "nativeloader/native_loader.h" #include "public_libraries.h" @@ -414,7 +415,7 @@ class NativeLoaderTest_Create : public NativeLoaderTest { env()->NewStringUTF(permitted_path.c_str())); // no error - EXPECT_EQ(err, nullptr); + EXPECT_EQ(err, nullptr) << "Error is: " << std::string(ScopedUtfChars(env(), err).c_str()); if (!IsBridged()) { struct android_namespace_t* ns = @@ -444,6 +445,7 @@ TEST_P(NativeLoaderTest_Create, BundledSystemApp) { dex_path = "/system/app/foo/foo.apk"; is_shared = true; + expected_namespace_name = "classloader-namespace-shared"; expected_namespace_flags |= ANDROID_NAMESPACE_TYPE_SHARED; SetExpectations(); RunTest(); @@ -453,6 +455,7 @@ TEST_P(NativeLoaderTest_Create, BundledVendorApp) { dex_path = "/vendor/app/foo/foo.apk"; is_shared = true; + expected_namespace_name = "classloader-namespace-shared"; expected_namespace_flags |= ANDROID_NAMESPACE_TYPE_SHARED; SetExpectations(); RunTest(); @@ -476,6 +479,7 @@ TEST_P(NativeLoaderTest_Create, BundledProductApp_pre30) { dex_path = "/product/app/foo/foo.apk"; is_shared = true; + expected_namespace_name = "classloader-namespace-shared"; expected_namespace_flags |= ANDROID_NAMESPACE_TYPE_SHARED; SetExpectations(); RunTest(); @@ -486,6 +490,7 @@ TEST_P(NativeLoaderTest_Create, BundledProductApp_post30) { is_shared = true; target_sdk_version = 30; + expected_namespace_name = "classloader-namespace-shared"; expected_namespace_flags |= ANDROID_NAMESPACE_TYPE_SHARED; SetExpectations(); RunTest(); @@ -568,7 +573,7 @@ TEST_P(NativeLoaderTest_Create, TwoApks) { env()->NewStringUTF(second_app_permitted_path.c_str())); // success - EXPECT_EQ(err, nullptr); + EXPECT_EQ(err, nullptr) << "Error is: " << std::string(ScopedUtfChars(env(), err).c_str()); if (!IsBridged()) { struct android_namespace_t* ns = |