commit 09ca44f3dad845061547eedb2b55e9abc707e74d
author Elliott Hughes <enh@google.com> Wed Oct 06 20:09:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 06 20:09:05 2021 +0000
tree 2654ebb764e0c203a79617e0e0228787e8b1ee12
parent ac96ed1c97d64f57d50fac582d39f6d7f5f6cc68
parent 8e1c59bf2ae783a82facec3da3a0c8abebd62878

Merge "Track strerror(3) change." am: 3a9d577990 am: 8e1c59bf2a

Original change: https://android-review.googlesource.com/c/platform/system/libbase/+/1843536

Change-Id: I5869f2b4c243d264253bebcff5398dc511fbbbcb

file_test.cpp

diff --git a/file_test.cpp b/file_test.cpp
index 120228d..61dcc80 100644
--- a/file_test.cpp
+++ b/file_test.cpp
@@ -16,6 +16,7 @@
 
 #include "android-base/file.h"
 
+#include "android-base/test_utils.h"
 #include "android-base/utf8.h"
 
 #include <gtest/gtest.h>
@@ -248,7 +249,7 @@
   // Remove dir's search permission.
   ASSERT_TRUE(chmod(td.path, S_IRUSR | S_IWUSR) == 0);
   ASSERT_FALSE(android::base::RemoveFileIfExists(tf.path, &err));
-  ASSERT_EQ("Permission denied", err);
+  ASSERT_MATCH(err, "Permission denied.*");
   // Set dir's search permission again.
   ASSERT_TRUE(chmod(td.path, S_IRWXU) == 0);
   ASSERT_TRUE(android::base::RemoveFileIfExists(tf.path, &err));