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>
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.