commit c6f8f1bfcc6abf4225ed35abdda84c07abcf02ab
author Austin Schuh <austin.linux@gmail.com> Wed Dec 02 23:23:39 2020 -0800
committer Austin Schuh <austin.linux@gmail.com> Thu Dec 03 20:14:59 2020 -0800
tree 1f562d995a0ca1761cc6cd8611cd3f812e929af6
parent b12efb197f952ca422c0094901e5f385427f88da

Support running logger_test under gdb

Use /tmp/ if TEST_TMPDIR isn't available, and clean up .xz files
properly.

Change-Id: Idf9b47954ffa611db96355969f9d7e34ed618851

aos/events/logging/logger_test.cc

diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index dbc8a78..2dc02ef 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -112,7 +112,7 @@
 
 // Tests calling StartLogging twice.
 TEST_F(LoggerDeathTest, ExtraStart) {
-  const ::std::string tmpdir(getenv("TEST_TMPDIR"));
+  const ::std::string tmpdir = aos::testing::TestTmpDir();
   const ::std::string base_name1 = tmpdir + "/logfile1";
   const ::std::string logfile1 = base_name1 + ".part0.bfbs";
   const ::std::string base_name2 = tmpdir + "/logfile2";
@@ -144,7 +144,7 @@
 
 // Tests calling StopLogging twice.
 TEST_F(LoggerDeathTest, ExtraStop) {
-  const ::std::string tmpdir(getenv("TEST_TMPDIR"));
+  const ::std::string tmpdir = aos::testing::TestTmpDir();
   const ::std::string base_name = tmpdir + "/logfile";
   const ::std::string logfile = base_name + ".part0.bfbs";
   // Remove it.
@@ -173,7 +173,7 @@
 
 // Tests that we can startup twice.
 TEST_F(LoggerTest, StartsTwice) {
-  const ::std::string tmpdir(getenv("TEST_TMPDIR"));
+  const ::std::string tmpdir = aos::testing::TestTmpDir();
   const ::std::string base_name1 = tmpdir + "/logfile1";
   const ::std::string logfile1 = base_name1 + ".part0.bfbs";
   const ::std::string base_name2 = tmpdir + "/logfile2";
@@ -236,7 +236,7 @@
 
 // Tests that we can read and write rotated log files.
 TEST_F(LoggerTest, RotatedLogFile) {
-  const ::std::string tmpdir(getenv("TEST_TMPDIR"));
+  const ::std::string tmpdir = aos::testing::TestTmpDir();
   const ::std::string base_name = tmpdir + "/logfile";
   const ::std::string logfile0 = base_name + ".part0.bfbs";
   const ::std::string logfile1 = base_name + ".part1.bfbs";
@@ -318,7 +318,7 @@
 
 // Tests that a large number of messages per second doesn't overwhelm writev.
 TEST_F(LoggerTest, ManyMessages) {
-  const ::std::string tmpdir(getenv("TEST_TMPDIR"));
+  const ::std::string tmpdir = aos::testing::TestTmpDir();
   const ::std::string base_name = tmpdir + "/logfile";
   const ::std::string logfile = base_name + ".part0.bfbs";
   // Remove the log file.
@@ -369,7 +369,7 @@
             configuration::GetNode(event_loop_factory_.configuration(), "pi1")),
         pi2_(
             configuration::GetNode(event_loop_factory_.configuration(), "pi2")),
-        tmp_dir_(getenv("TEST_TMPDIR")),
+        tmp_dir_(aos::testing::TestTmpDir()),
         logfile_base_(tmp_dir_ + "/multi_logfile"),
         logfiles_(
             {logfile_base_ + "_pi1_data.part0.bfbs",
@@ -407,6 +407,7 @@
     // Go through and remove the logfiles if they already exist.
     for (const auto file : logfiles_) {
       unlink(file.c_str());
+      unlink((file + ".xz").c_str());
     }
 
     LOG(INFO) << "Logging data to " << logfiles_[0] << ", " << logfiles_[1]