commit 2c3752987cb55735f78b15969352780c3337651c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:10:50 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:10:50 2023 +0000
tree 7e56ce7c943781ef6d255e2264e55fe5b626bcc8
parent 0d1fac8f1e9d2e580e642d6dd1e1977bbe4175b1
parent a80bee481bda3af80ba044a5edce3506971abab8

Snap for 10453563 from a80bee481bda3af80ba044a5edce3506971abab8 to mainline-uwb-release

Change-Id: Id170a2e3ff007c8d2b1bb1dadf7023d7c1e05599

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 328028d..c001ee4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,7 +7,7 @@
       "name": "fmtlib_ostream_test"
     }
   ],
-  "hwasan-postsubmit": [
+  "hwasan-presubmit": [
     {
       "name": "fmtlib_test"
     },

test/gtest-extra.h

diff --git a/test/gtest-extra.h b/test/gtest-extra.h
index 01c70dd..949ff50 100644
--- a/test/gtest-extra.h
+++ b/test/gtest-extra.h
@@ -67,8 +67,6 @@
   fmt::file original_;  // Original file passed to redirector.
   fmt::file read_end_;  // Read end of the pipe where the output is redirected.
 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(OutputRedirect);
-
   void flush();
   void restore();
 
@@ -76,6 +74,9 @@
   explicit OutputRedirect(FILE* file);
   ~OutputRedirect() FMT_NOEXCEPT;
 
+  OutputRedirect(const OutputRedirect&) = delete;
+  OutputRedirect& operator=(const OutputRedirect&) = delete;
+
   // Restores the original file, reads output from the pipe into a string
   // and returns it.
   std::string restore_and_read();