diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:00:50 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:00:50 +0000 |
commit | fceb52d8dc8a63723fa3b2ac699825c9da829b92 (patch) | |
tree | 7e56ce7c943781ef6d255e2264e55fe5b626bcc8 | |
parent | 3e228003f9b10dc1097be72e2576ec3cfb23b27e (diff) | |
parent | a80bee481bda3af80ba044a5edce3506971abab8 (diff) | |
download | fmtlib-android14-mainline-os-statsd-release.tar.gz |
Snap for 10453563 from a80bee481bda3af80ba044a5edce3506971abab8 to mainline-os-statsd-releaseaml_sta_341710000aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_net_341111030android14-mainline-os-statsd-release
Change-Id: I3474c6f4cada28c7973c4540acb2aa131973e1e1
-rw-r--r-- | TEST_MAPPING | 2 | ||||
-rw-r--r-- | test/gtest-extra.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 328028d6..c001ee4f 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -7,7 +7,7 @@ "name": "fmtlib_ostream_test" } ], - "hwasan-postsubmit": [ + "hwasan-presubmit": [ { "name": "fmtlib_test" }, diff --git a/test/gtest-extra.h b/test/gtest-extra.h index 01c70ddb..949ff50e 100644 --- a/test/gtest-extra.h +++ b/test/gtest-extra.h @@ -67,8 +67,6 @@ class OutputRedirect { 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 @@ class OutputRedirect { 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(); |