diff options
-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(); |