Bug#14028421 DBUG_SUICIDE() DOES NOT FLUSH GCOV DATA

Tor Didriksen · Tor Didriksen · commit a5125311d8ac · 2012-05-09T09:13:25.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -218,9 +218,9 @@ ENDIF()
 OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
 IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE)
   SET(CMAKE_CXX_FLAGS_DEBUG
-    "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
+    "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -DHAVE_GCOV")
   SET(CMAKE_C_FLAGS_DEBUG
-    "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
+    "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -DHAVE_GCOV")
   SET(CMAKE_EXE_LINKER_FLAGS_DEBUG
     "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -lgcov")
 ENDIF()
diff --git a/dbug/dbug.c b/dbug/dbug.c
@@ -2223,12 +2223,23 @@ void _db_flush_()
 
 
 #ifndef __WIN__
+
+#ifdef HAVE_GCOV
+extern void __gcov_flush();
+#endif
+
 void _db_suicide_()
 {
   int retval;
   sigset_t new_mask;
   sigfillset(&new_mask);
 
+#ifdef HAVE_GCOV
+  fprintf(stderr, "Flushing gcov data\n");
+  fflush(stderr);
+  __gcov_flush();
+#endif
+
   fprintf(stderr, "SIGKILL myself\n");
   fflush(stderr);
 
