commit e325de9cedca347ceff6624414626c67f7a1705f
author Steven Moreland <smoreland@google.com> Thu Oct 07 01:06:10 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 07 01:06:10 2021 +0000
tree b6db86b968f491c44d6eaf22cd840491b5373876
parent 632660989a88ca35fb0d14b7208b76f979dc4fd9
parent 779a9a6ab7a26172b657bbb2d4cae454429e717e

Merge "Revert "Track strerror(3) change."" am: cc4244fadf am: 7db97a6e96 am: 779a9a6ab7

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

Change-Id: Ie08098efbc83abe557a9c8cc82f7b92d68f964ed

file_test.cpp

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