fix - re-add log flush to srsran_assert

4 years ago · ce47cf5910
parent 63913ff2b2
commit ce47cf5910
2 changed files with 3 additions and 3 deletions
--- a/lib/include/srsran/common/srsran_assert.h
+++ b/lib/include/srsran/common/srsran_assert.h
@ -20,6 +20,7 @@

 #define srsran_terminate(fmt, ...)                                                                                     \
  std::fprintf(stderr, "%s:%d: " fmt "\n", __FILE__, __LINE__, ##__VA_ARGS__);                                         \
+  srslog::flush();                                                                                                     \
  std::abort()

 #ifdef ASSERTS_ENABLED
@ -60,9 +61,7 @@
  do {                                                                                                                 \
  } while (0)

-#define srsran_expect(condition, fmt, ...)                                                                             \
-  do {                                                                                                                 \
-  } while (0)
+#define srsran_expect(condition, fmt, ...) srsran_assert(condition, fmt, ##__VA_ARGS__)

 #endif

--- a/lib/test/common/CMakeLists.txt
+++ b/lib/test/common/CMakeLists.txt
@ -46,6 +46,7 @@ add_executable(bcd_helpers_test bcd_helpers_test.cc)
 target_link_libraries(bcd_helpers_test srsran_common)

 add_executable(stack_procedure_test stack_procedure_test.cc)
+target_link_libraries(stack_procedure_test srsran_common)
 add_test(stack_procedure_test stack_procedure_test)

 add_executable(queue_test multiqueue_test.cc)