commit 99f25beb8cfb8a6704f2648ec47f066907403e55
author Patrick Venture <venture@google.com> Mon Sep 28 15:12:21 2020 -0700
committer Patrick Venture <venture@google.com> Mon Sep 28 15:35:01 2020 -0700
tree 827f07bbb31c742feebcd158a77447ceb1316102
parent b6ed562666a3153b539a7895dcdee4996be2b4c7

test/utils: stop using local variable with global return

Removes warnings about returning a local variable's address.  The code
was "safe" because it was always returned before the stack was returned
from, but this change makes it "safer."

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I675dfd1ae348dcf6a3bc47b9c1ca904da11238af

test/utils_unittest.cpp

diff --git a/test/utils_unittest.cpp b/test/utils_unittest.cpp
index 6b89f6a..ba3c93f 100644
--- a/test/utils_unittest.cpp
+++ b/test/utils_unittest.cpp
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace fs = std::filesystem;
@@ -20,12 +21,12 @@
 using ::testing::StrEq;
 using ::testing::StrictMock;
 
-std::vector<std::string>* returnList = nullptr;
+std::vector<std::string> returnList;
 
 std::vector<std::string> getLibraryList(const std::string& path,
                                         PathMatcher check)
 {
-    return (returnList) ? *returnList : std::vector<std::string>();
+    return returnList;
 }
 
 std::unique_ptr<GenericBlobInterface> factoryReturn;
@@ -35,7 +36,16 @@
     return std::move(factoryReturn);
 }
 
-TEST(UtilLoadLibraryTest, NoFilesFound)
+class UtilLoadLibraryTest : public ::testing::Test
+{
+  protected:
+    UtilLoadLibraryTest()
+    {
+        returnList = {};
+    }
+};
+
+TEST_F(UtilLoadLibraryTest, NoFilesFound)
 {
     /* Verify nothing special happens when there are no files found. */
 
@@ -45,13 +55,12 @@
     loadLibraries(&manager, "", &dlsys);
 }
 
-TEST(UtilLoadLibraryTest, OneFileFoundIsLibrary)
+TEST_F(UtilLoadLibraryTest, OneFileFoundIsLibrary)
 {
     /* Verify if it finds a library, and everything works, it'll regsiter it.
      */
 
-    std::vector<std::string> files = {"this.fake"};
-    returnList = &files;
+    returnList = {"this.fake"};
 
     StrictMock<internal::InternalDlSysMock> dlsys;
     StrictMock<ManagerMock> manager;