commit 126dcff64d663dc376b8daffd0e65c2d71598fce
author James Kuszmaul <james.kuszmaul@bluerivertech.com> Fri Aug 12 16:30:05 2022 -0700
committer Austin Schuh <austin.linux@gmail.com> Fri Aug 26 12:23:51 2022 -0700
tree a4e3d09813da9bc3b496cd8506ec02a874230f95
parent 0168ec3f8fc12af906d5145a5d9e072dd7bab160
parent ba0ac1a6cc1d77ae907d43fe917876dbae842d9f

Merge commit 'ea7aeac570d63a673a082ba216fa119a156620b2' into HEAD

Upgrade glog. Sarah was using LOG_EVERY_T in
2b7e98861367daaccd5f8ac79be7f1d1d23af89e, and it
seemed about time that we upgraded.

This also brings in a fix from Brian to correctly handle
defines in autocxx_library.

Change-Id: I998f1c1f11b7a8b57e1906acdec1f5dd3c995111
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>

aos/containers/sized_array_test.cc

diff --git a/aos/containers/sized_array_test.cc b/aos/containers/sized_array_test.cc
index 47be950..c5065f8 100644
--- a/aos/containers/sized_array_test.cc
+++ b/aos/containers/sized_array_test.cc
@@ -166,7 +166,7 @@
   // Verify that we didn't reallocate
   EXPECT_EQ(pre_front, a.data());
 
-  EXPECT_DEATH(a.emplace_back(5), "SIGILL");
+  EXPECT_DEATH(a.emplace_back(5), "Aborted at");
 }
 
 }  // namespace testing

aos/network/rawrtc.h

diff --git a/aos/network/rawrtc.h b/aos/network/rawrtc.h
index 4c61313..f9de8b0 100644
--- a/aos/network/rawrtc.h
+++ b/aos/network/rawrtc.h
@@ -17,20 +17,19 @@
 namespace web_proxy {
 
 // TODO(austin): This doesn't allow streaming data in.
-#define CHECK_RAWRTC(x)                            \
-  [&]() {                                          \
-    enum rawrtc_code r = x;                        \
-    return CHECK(r == RAWRTC_CODE_SUCCESS)         \
-           << " actual " << rawrtc_code_to_str(r); \
+#define CHECK_RAWRTC(x)                                                     \
+  [&]() {                                                                   \
+    enum rawrtc_code r = x;                                                 \
+    CHECK(r == RAWRTC_CODE_SUCCESS) << " actual " << rawrtc_code_to_str(r); \
   }()
 
-#define CHECK_RAWRTC_IGNORE(x, i)           \
-  [&]() {                                   \
-    enum rawrtc_code r = x;                 \
-    for (auto w : i) {                      \
-      if (w == r) return;                   \
-    }                                       \
-    return CHECK(r == RAWRTC_CODE_SUCCESS); \
+#define CHECK_RAWRTC_IGNORE(x, i)    \
+  [&]() {                            \
+    enum rawrtc_code r = x;          \
+    for (auto w : i) {               \
+      if (w == r) return;            \
+    }                                \
+    CHECK(r == RAWRTC_CODE_SUCCESS); \
   }()
 
 // Wrapper around a RawRTC data channel to manage it's lifetime and provide C++

aos/realtime_test.cc

diff --git a/aos/realtime_test.cc b/aos/realtime_test.cc
index 98f53e1..4135a9f 100644
--- a/aos/realtime_test.cc
+++ b/aos/realtime_test.cc
@@ -114,7 +114,7 @@
         int x = reinterpret_cast<const volatile int *>(0)[0];
         LOG(INFO) << x;
       },
-      "SIGSEGV \\(@0x0\\) received by PID.*stack trace:");
+      "\\*\\*\\* Aborted at .*");
 }
 
 // Tests that RAW_LOG(FATAL) explodes properly.