commit 94fd9eaee76e862932dded6583a9c052e5aa9efc
author Martin Stjernholm <mast@google.com> Thu Oct 24 16:57:34 2019 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 13 17:50:14 2019 +0000
tree 26638e055a87784bd4d05fac144f644a64a99320
parent 149cddaa22a1a78e8dde179d2c33b745cb500629

Use a different name for shared classloader namespace, to help debugging.

Test: atest libnativeloader_test
Bug: 130388701
Change-Id: I6dbb53cac7fb7ac8fb5178611a164c83c2ab59ba

libnativeloader/native_loader_test.cpp

diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp
index 7fdb0c0..8a8193e 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 @@
         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 @@
   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 @@
   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 @@
   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 @@
   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 @@
       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 =