commit 617c4b5876e6b572f08461fead9e5f519027250d
author Elliott Hughes <enh@google.com> Fri Oct 01 23:43:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 01 23:43:31 2021 +0000
tree 3fc4a87aebf35148c7a5426f9be00f2ba610b2a0
parent 4201548a9a5c6d1dec6abaa5f8245c962b50f5c4
parent b4d930462828793875e32c834f2608fd82372436

Merge "Move ExecTestHelper to using a regex." am: b4d9304628

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1843499

Change-Id: I1c1f6cb3fe3930de9593cf531d49ca99681b59b6

tests/dl_test.cpp

diff --git a/tests/dl_test.cpp b/tests/dl_test.cpp
index ad16501..bf32bd5 100644
--- a/tests/dl_test.cpp
+++ b/tests/dl_test.cpp
@@ -133,7 +133,8 @@
       "helper_func called\n";
   ExecTestHelper eth;
   eth.SetArgs({ path_to_linker, helper.c_str(), nullptr });
-  eth.Run([&]() { execve(path_to_linker, eth.GetArgs(), eth.GetEnv()); }, 0, expected_output.c_str());
+  eth.Run([&]() { execve(path_to_linker, eth.GetArgs(), eth.GetEnv()); }, 0, nullptr);
+  ASSERT_EQ(expected_output, eth.GetOutput());
 #endif
 }
 
@@ -149,7 +150,8 @@
       "helper_func called\n";
   ExecTestHelper eth;
   eth.SetArgs({ path_to_linker, helper.c_str(), nullptr });
-  eth.Run([&]() { execve(path_to_linker, eth.GetArgs(), eth.GetEnv()); }, 0, expected_output.c_str());
+  eth.Run([&]() { execve(path_to_linker, eth.GetArgs(), eth.GetEnv()); }, 0, nullptr);
+  ASSERT_EQ(expected_output, eth.GetOutput());
 #endif
 }
 

tests/utils.h

diff --git a/tests/utils.h b/tests/utils.h
index 592ac0e..284140a 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -229,7 +229,7 @@
   }
 
   void Run(const std::function<void()>& child_fn, int expected_exit_status,
-           const char* expected_output) {
+           const char* expected_output_regex) {
     int fds[2];
     ASSERT_NE(pipe(fds), -1);
 
@@ -258,8 +258,10 @@
 
     std::string error_msg("Test output:\n" + output_);
     AssertChildExited(pid, expected_exit_status, &error_msg);
-    if (expected_output != nullptr) {
-      ASSERT_EQ(expected_output, output_);
+    if (expected_output_regex != nullptr) {
+      if (!std::regex_search(output_, std::regex(expected_output_regex))) {
+        FAIL() << "regex " << expected_output_regex << " didn't match " << output_;
+      }
     }
   }