testing

onny · Dec 6, 2016 · 4d0797b · 4d0797b
1 parent 667de2f
commit 4d0797b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/gcov.sh b/gcov.sh
@@ -2,13 +2,13 @@
 
 gcov_init() {
  USER=`whoami`
- firejail --help
- firemon --help
- /usr/lib/firejail/fnet --help
- /usr/lib/firejail/fseccomp --help
- /usr/lib/firejail/ftee --help
- /usr/lib/firejail/fcopy --help
- firecfg --help
+ firejail --help > /dev/null
+ firemon --help > /dev/null
+ /usr/lib/firejail/fnet --help > /dev/null
+ /usr/lib/firejail/fseccomp --help > /dev/null
+ /usr/lib/firejail/ftee --help > /dev/null
+ /usr/lib/firejail/fcopy --help > /dev/null
+ firecfg --help > /dev/null
  sudo chown $USER:$USER `find .`
 }
 
@@ -24,6 +24,13 @@ generate() {
 
 
 gcov_init
+lcov -q --capture -d src/firejail -d src/firemon -d src/fcopy -d src/fseccomp -d src/fnet -d src/ftee -d src/lib -d src/firecfg --output-file gcov-file-old
+
+#make test-environment
+#generate
+#sleep 2
+#exit
+
 
 # running tests
 make test-root

diff --git a/src/firejail/profile.c b/src/firejail/profile.c
@@ -1053,6 +1053,9 @@ void profile_read(const char *fname) {
 // else {
 // free(ptr);
 // }
+#ifdef HAVE_GCOV
+ __gcov_flush();
+#endif
  }
  fclose(fp);
 }
diff --git a/src/firejail/rlimit.c b/src/firejail/rlimit.c
@@ -27,6 +27,9 @@ void set_rlimits(void) {
  if (arg_rlimit_nofile) {
  rl.rlim_cur = (rlim_t) cfg.rlimit_nofile;
  rl.rlim_max = (rlim_t) cfg.rlimit_nofile;
+#ifdef HAVE_GCOV // gcov-instrumented programs might crash at this point
+ __gcov_dump();
+#endif
  if (setrlimit(RLIMIT_NOFILE, &rl) == -1)
  errExit("setrlimit");
  if (arg_debug)
@@ -36,6 +39,9 @@ void set_rlimits(void) {
  if (arg_rlimit_nproc) {
  rl.rlim_cur = (rlim_t) cfg.rlimit_nproc;
  rl.rlim_max = (rlim_t) cfg.rlimit_nproc;
+#ifdef HAVE_GCOV
+ __gcov_dump();
+#endif
  if (setrlimit(RLIMIT_NPROC, &rl) == -1)
  errExit("setrlimit");
  if (arg_debug)
@@ -45,6 +51,9 @@ void set_rlimits(void) {
  if (arg_rlimit_fsize) {
  rl.rlim_cur = (rlim_t) cfg.rlimit_fsize;
  rl.rlim_max = (rlim_t) cfg.rlimit_fsize;
+#ifdef HAVE_GCOV
+ __gcov_dump();
+#endif
  if (setrlimit(RLIMIT_FSIZE, &rl) == -1)
  errExit("setrlimit");
  if (arg_debug)
@@ -54,6 +63,9 @@ void set_rlimits(void) {
  if (arg_rlimit_sigpending) {
  rl.rlim_cur = (rlim_t) cfg.rlimit_sigpending;
  rl.rlim_max = (rlim_t) cfg.rlimit_sigpending;
+#ifdef HAVE_GCOV
+ __gcov_dump();
+#endif
  if (setrlimit(RLIMIT_SIGPENDING, &rl) == -1)
  errExit("setrlimit");
  if (arg_debug)

diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
@@ -286,6 +286,9 @@ void start_application(void) {
  //****************************************
  if (arg_audit) {
  assert(arg_audit_prog);
+#ifdef HAVE_GCOV
+ __gcov_dump();
+#endif
  execl(arg_audit_prog, arg_audit_prog, NULL);
  }
  //****************************************
@@ -309,6 +312,9 @@ void start_application(void) {
  if (!arg_command && !arg_quiet)
  printf("Child process initialized\n");
 
+#ifdef HAVE_GCOV
+ __gcov_dump();
+#endif
  execvp(cfg.original_argv[cfg.original_program_index], &cfg.original_argv[cfg.original_program_index]);
  exit(1);
  }
@@ -356,6 +362,9 @@ void start_application(void) {
 
  if (!arg_command && !arg_quiet)
  printf("Child process initialized\n");
+#ifdef HAVE_GCOV
+ __gcov_dump();
+#endif
  execvp(arg[0], arg);
  }