testing

8 files changed, 37 insertions, 0 deletions

diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index a3576e7c4..c906e32c0 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -247,6 +247,9 @@ void fs_private_bin_list(void) {
                         duplicate(ptr);
                 free(dlist);    
                 fs_logger_print();
+#ifdef HAVE_GCOV
+                __gcov_flush();
+#endif
                 _exit(0);
         }
         // wait for the child to finish
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c
index 830de7c9f..ebcde29a3 100644
--- a/src/firejail/fs_etc.c
+++ b/src/firejail/fs_etc.c
@@ -171,6 +171,9 @@ void fs_private_etc_list(void) {
                                 duplicate(ptr);
                         free(dlist);    
                         fs_logger_print();
+#ifdef HAVE_GCOV
+                        __gcov_flush();
+#endif
                         _exit(0);
                 }
                 // wait for the child to finish
diff --git a/src/firejail/fs_mkdir.c b/src/firejail/fs_mkdir.c
index cffe32a7a..6bcb3f33e 100644
--- a/src/firejail/fs_mkdir.c
+++ b/src/firejail/fs_mkdir.c
@@ -81,6 +81,9 @@ void fs_mkdir(const char *name) {
 
                 // create directory
                 mkdir_recursive(expanded);
+#ifdef HAVE_GCOV
+                __gcov_flush();
+#endif
                 _exit(0);
         }
         // wait for the child to finish
@@ -126,6 +129,9 @@ void fs_mkfile(const char *name) {
                         (void) rv;
                         fclose(fp);
                 }
+#ifdef HAVE_GCOV
+                __gcov_flush();
+#endif
                 _exit(0);
         }
         // wait for the child to finish
diff --git a/src/firejail/ls.c b/src/firejail/ls.c
index 7c5585324..1b759d7a1 100644
--- a/src/firejail/ls.c
+++ b/src/firejail/ls.c
@@ -358,6 +358,9 @@ void sandboxfs(int op, pid_t pid, const char *path1, const char *path2) {
                         // copy the file
                         if (copy_file(src_fname, tmp_fname, getuid(), getgid(), 0600))
                                 _exit(1);
+#ifdef HAVE_GCOV
+                        __gcov_flush();
+#endif
                         _exit(0);
                 }
 
@@ -381,6 +384,9 @@ void sandboxfs(int op, pid_t pid, const char *path1, const char *path2) {
                         // copy the file
                         if (copy_file(tmp_fname, dest_fname, getuid(), getgid(), 0600))
                                 _exit(1);
+#ifdef HAVE_GCOV
+                        __gcov_flush();
+#endif
                         _exit(0);
                 }
 
@@ -423,6 +429,9 @@ void sandboxfs(int op, pid_t pid, const char *path1, const char *path2) {
                         // copy the file
                         if (copy_file(src_fname, tmp_fname, getuid(), getgid(), 0600))
                                 _exit(1);
+#ifdef HAVE_GCOV
+                        __gcov_flush();
+#endif
                         _exit(0);
                 }
 
@@ -452,6 +461,9 @@ void sandboxfs(int op, pid_t pid, const char *path1, const char *path2) {
                         // copy the file
                         if (copy_file(tmp_fname, dest_fname, getuid(), getgid(), 0600))
                                 _exit(1);
+#ifdef HAVE_GCOV
+                        __gcov_flush();
+#endif
                         _exit(0);
                 }
 
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 4759e6a5f..3f005b547 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -2461,6 +2461,9 @@ int main(int argc, char **argv) {
                         network_main(child);
                         if (arg_debug)
                                 printf("Host network configured\n");                    
+#ifdef HAVE_GCOV
+                        __gcov_flush();
+#endif
                         _exit(0);                       
                 }
 
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index ecab8880a..54f947c45 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -692,6 +692,9 @@ void x11_xorg(void) {
                 execlp("/usr/bin/xauth", "/usr/bin/xauth", "-f", tmpfname,
                         "generate", display, "MIT-MAGIC-COOKIE-1", "untrusted", NULL); 
                 
+#ifdef HAVE_GCOV
+                __gcov_flush();
+#endif
                 _exit(0);
         }
 
diff --git a/src/firemon/interface.c b/src/firemon/interface.c
index bceed93d3..58990e6e5 100644
--- a/src/firemon/interface.c
+++ b/src/firemon/interface.c
@@ -146,6 +146,9 @@ static void print_sandbox(pid_t pid) {
                         return;
                 net_ifprint();
                 printf("\n");
+#ifdef HAVE_GCOV
+                __gcov_flush();
+#endif
                 _exit(0);
         }
         
diff --git a/src/firemon/procevent.c b/src/firemon/procevent.c
index 78a3a4fb2..1940f4a34 100644
--- a/src/firemon/procevent.c
+++ b/src/firemon/procevent.c
@@ -192,6 +192,10 @@ static int procevent_monitor(const int sock, pid_t mypid) {
         tv.tv_usec = 0;
 
         while (1) {
+#ifdef HAVE_GCOV
+                __gcov_flush();
+#endif
+
 #define BUFFSIZE 4096 
                 char __attribute__ ((aligned(NLMSG_ALIGNTO)))buf[BUFFSIZE];