commit 3ccee07b64955785e7dad54be3eb56deaf77f278
author William A. Kennington III <wak@google.com> Tue Jun 15 16:51:30 2021 -0700
committer William A. Kennington III <wak@google.com> Wed Jun 16 11:48:36 2021 -0700
tree 000b913c4466e731e646f4dfd23890daf8b19d6b
parent 766beb3f975e030470fe1eafc2d6cf55578e5347

utils: Make loader more lenient

Loaded modules tend to be unversioned, so we shouldn't enforce that they
have a version suffix.

Change-Id: I9e7a02ea841b7c0634c84718c46707f087ee86ae
Signed-off-by: William A. Kennington III <wak@google.com>

test/utils_unittest.cpp

diff --git a/test/utils_unittest.cpp b/test/utils_unittest.cpp
index ba3c93f..cba8ee2 100644
--- a/test/utils_unittest.cpp
+++ b/test/utils_unittest.cpp
@@ -93,8 +93,8 @@
         {"libblobcmds.0.0.1", false}, {"libblobcmds.0.0", false},
         {"libblobcmds.0", false},     {"libblobcmds.10", false},
         {"libblobcmds.a", false},     {"libcmds.so.so.0", true},
-        {"libcmds.so.0", true},       {"libcmds.so.0.0", false},
-        {"libcmds.so.0.0.10", false}, {"libblobs.so.1000", true}};
+        {"libcmds.so.0", true},       {"libcmds.so", true},
+        {"libcmds.so.0.0.10", true},  {"libblobs.so.1000", true}};
 
     for (const auto& test : tests)
     {

utils.cpp

diff --git a/utils.cpp b/utils.cpp
index fa2bf6a..d0a5e5e 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -35,7 +35,7 @@
 
 bool matchBlobHandler(const std::string& filename)
 {
-    return std::regex_match(filename, std::regex(".+\\.so\\.\\d+$"));
+    return filename.find(".so") != std::string::npos;
 }
 
 void loadLibraries(ManagerInterface* manager, const std::string& path,