commit fa48ba7eb60e28479c918febf4ece78470a0de1b
author Dimitry Ivanov <dimitry@google.com> Wed Mar 09 11:23:31 2016 -0800
committer Dimitry Ivanov <dimitry@google.com> Wed Mar 09 11:23:31 2016 -0800
tree 0f98f3d7c4268d75a0699c26132322081d38d072
parent 7faf69ef025d577f2a7d29d63d278f4517ac5b51

Relax the error message check

Bug: http://b/27556691
Change-Id: I25dc4985b29555c9fe0cde9ce237ae34c693032d

tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp

diff --git a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
index acc3b98..cf3b7e7 100644
--- a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
+++ b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
@@ -146,7 +146,8 @@
         // Check the error message
         std::string err = dlerror();
 
-        if (err != "dlopen failed: library \"" + path + "\" is not accessible for the namespace \"classloader-namespace\"") {
+        if (err.find("dlopen failed: library \"" + path + "\"") != 0 ||
+            err.find("is not accessible for the namespace \"classloader-namespace\"") == std::string::npos) {
           *error_msg = "unexpected dlerror: " + err;
           return false;
         }