16 files changed, 30 insertions, 76 deletions

diff --git a/Makefile.in b/Makefile.in
index 8649475dd..86fd4f4b7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,6 @@ clean:
         for dir in $(APPS) $(MYLIBS); do \
                 $(MAKE) -C $$dir clean; \
         done
-        rm -fr gcov-file gcov-dir gcov-test-initialized
         rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm
         rm -f test/utils/index.html*
         rm -f test/utils/wget-log
@@ -146,7 +145,7 @@ uninstall:
         rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg
         
 DISTFILES = "src etc platform configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkuid.sh COPYING README RELNOTES"
-DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils"
+DISTFILES_TEST = "test/rlimit test/apps test/apps-x11 test/apps-x11-xorg test/root test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils"
 
 dist:
         mv config.status config.status.old
@@ -188,14 +187,6 @@ cppcheck: clean
 scan-build: clean
         scan-build make
 
-gcov-test-initialized:
-        ./gcov-test-init.sh
-        
-gcov: gcov-test-initialized
-        lcov --capture -d src/firejail -d src/firemon -d src/fseccomp -d src/fnet -d src/ftee -d src/lib -d src/firecfg --output-file gcov-file
-        rm -fr gcov-dir
-        genhtml gcov-file --output-directory gcov-dir
-        
 
 #
 # make test
@@ -232,7 +223,10 @@ test-arguments:
 test-fs:
         cd test/fs; ./fs.sh | grep TESTING
 
-test: test-profiles test-fs test-utils  test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments
+test-rlimit:
+        cd test/rlimit; ./rlimit.sh | grep TESTING
+        
+test: test-profiles test-fs test-utils  test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments test-rlimit
         echo "TEST COMPLETE"
 
 ##########################################
diff --git a/gcov-test-init.sh b/gcov-test-init.sh
deleted file mode 100755
index e98d9fa79..000000000
--- a/gcov-test-init.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-USER=`whoami`
-firejail --help
-firemon --help
-/usr/lib/firejail/fnet --help
-/usr/lib/firejail/fseccomp --help
-/usr/lib/firejail/ftee --help
-firecfg --help
-sudo chown $USER:$USER `find .`
-touch gcov-test-initialized
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index 91fbe592a..242482d26 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -626,6 +626,9 @@ void fs_private_home_list(void) {
 
                 fs_logger_print();      // save the current log
                 free(dlist);
+#ifdef HAVE_GCOV
+        __gcov_flush();
+#endif
                 _exit(0);
         }
         // wait for the child to finish
diff --git a/src/firejail/preproc.c b/src/firejail/preproc.c
index fe5f2eb44..ea4e6743f 100644
--- a/src/firejail/preproc.c
+++ b/src/firejail/preproc.c
@@ -104,16 +104,8 @@ void preproc_build_cp_command(void) {
         preproc_mount_mnt_dir();
         if (stat(RUN_CP_COMMAND, &s)) {
                 char* fname = realpath("/bin/cp", NULL);
-                if (fname == NULL) {
-                        fprintf(stderr, "Error: /bin/cp not found\n");
-                        exit(1);
-                }
-                if (stat(fname, &s)) {
-                        fprintf(stderr, "Error: /bin/cp not found\n");
-                        exit(1);
-                }
-                if (is_link(fname)) {
-                        fprintf(stderr, "Error: invalid /bin/cp file\n");
+                if (fname == NULL || stat(fname, &s) || is_link(fname)) {
+                        fprintf(stderr, "Error: invalid /bin/cp\n");
                         exit(1);
                 }
                 int rv = copy_file(fname, RUN_CP_COMMAND, 0, 0, 0755);
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index c76505591..6ec590eaa 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -130,7 +130,7 @@ void pulseaudio_init(void) {
                 int rv = mkdir(dir1, 0755);
                 if (rv == 0) {
                         if (set_perms(dir1, getuid(), getgid(), 0755))
-                                ; // do nothing
+                                {;} // do nothing
                 }
         }
         free(dir1);
@@ -140,7 +140,7 @@ void pulseaudio_init(void) {
                 int rv = mkdir(dir1, 0700);
                 if (rv == 0) {
                         if (set_perms(dir1, getuid(), getgid(), 0700))
-                                ; // do nothing
+                                {;} // do nothing
                 }
         }
         free(dir1);
diff --git a/test/apps-x11/xterm-xpra.exp b/test/apps-x11/xterm-xpra.exp
index 379de131a..1fb5df486 100755
--- a/test/apps-x11/xterm-xpra.exp
+++ b/test/apps-x11/xterm-xpra.exp
@@ -79,6 +79,18 @@ expect {
         "name=blablabla"
 }
 sleep 1
+
+send -- "firemon --x11\r"
+expect {
+        timeout {puts "TESTING ERROR 7\n";exit}
+        "name=test xterm"
+}
+expect {
+        timeout {puts "TESTING ERROR 7.1\n";exit}
+        "DISPLAY"
+}
+sleep 1
+
 send -- "firejail --shutdown=test\r"
 sleep 3
 
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index 04a1daaf6..5c4d49331 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -55,12 +55,6 @@ else
         echo "TESTING SKIP: zsh not found"
 fi
 
-echo "TESTING: rlimit (test/environment/rlimit.exp)"
-./rlimit.exp
-
-echo "TESTING: rlimit profile (test/environment/rlimit-profile.exp)"
-./rlimit-profile.exp
-
 echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)"
 ./firejail-in-firejail.exp
 
diff --git a/test/environment/rlimit-profile.exp b/test/rlimit/rlimit-profile.exp
index a9e54a405..a9e54a405 100755
--- a/test/environment/rlimit-profile.exp
+++ b/test/rlimit/rlimit-profile.exp
diff --git a/test/environment/rlimit.exp b/test/rlimit/rlimit.exp
index 611f69821..611f69821 100755
--- a/test/environment/rlimit.exp
+++ b/test/rlimit/rlimit.exp
diff --git a/test/environment/rlimit.profile b/test/rlimit/rlimit.profile
index 271891c03..271891c03 100644
--- a/test/environment/rlimit.profile
+++ b/test/rlimit/rlimit.profile
diff --git a/test/root/apache2.exp b/test/root/apache2.exp
index 7f67f4706..0b102bad5 100755
--- a/test/root/apache2.exp
+++ b/test/root/apache2.exp
@@ -4,10 +4,6 @@ set timeout 5
 spawn $env(SHELL)
 match_max 100000
 
-send -- "pkill apache\r"
-sleep 2
-
-
 send -- "firejail --name=apache /etc/init.d/apache2 start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
diff --git a/test/root/isc-dhcp.exp b/test/root/isc-dhcp.exp
index 86500707a..5d9597e7c 100755
--- a/test/root/isc-dhcp.exp
+++ b/test/root/isc-dhcp.exp
@@ -4,15 +4,6 @@ set timeout 5
 spawn $env(SHELL)
 match_max 100000
 
-send -- "sudo ls; sudo whoami; sudo pwd\r"
-expect {
-        timeout {puts "TESTING ERROR: you need to root run this test as root\n";exit}
-        "root"
-}
-
-send -- "pkill dhcpd\r"
-sleep 2
-
 send -- "firejail --name=dhcpd /etc/init.d/isc-dhcp-server start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
diff --git a/test/root/nginx.exp b/test/root/nginx.exp
index 0b62fada9..82ebe0ee7 100755
--- a/test/root/nginx.exp
+++ b/test/root/nginx.exp
@@ -4,10 +4,6 @@ set timeout 5
 spawn $env(SHELL)
 match_max 100000
 
-send -- "pkill nginx\r"
-sleep 2
-
-
 send -- "firejail --name=nginx /etc/init.d/nginx start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
diff --git a/test/root/root.sh b/test/root/root.sh
index 471b7d535..494bd4fe7 100755
--- a/test/root/root.sh
+++ b/test/root/root.sh
@@ -48,6 +48,12 @@ else
 fi
 
 #********************************
+# filesystem
+#********************************
+echo "TESTING: fs private (test/root/private.exp)"
+./private.exp
+
+#********************************
 # seccomp
 #********************************
 echo "TESTING: seccomp umount (test/root/seccomp-umount.exp)"
diff --git a/test/root/snmpd.exp b/test/root/snmpd.exp
index 90e34470f..610fdb13a 100755
--- a/test/root/snmpd.exp
+++ b/test/root/snmpd.exp
@@ -4,16 +4,6 @@ set timeout 5
 spawn $env(SHELL)
 match_max 100000
 
-send -- "sudo ls; sudo whoami; sudo pwd\r"
-expect {
-        timeout {puts "TESTING ERROR: you need to root run this test as root\n";exit}
-        "root"
-}
-
-send -- "pkill snmpd\r"
-sleep 2
-
-
 send -- "firejail --name=snmpd /etc/init.d/snmpd start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
diff --git a/test/root/unbound.exp b/test/root/unbound.exp
index 193e662ff..9c496306a 100755
--- a/test/root/unbound.exp
+++ b/test/root/unbound.exp
@@ -4,15 +4,6 @@ set timeout 5
 spawn $env(SHELL)
 match_max 100000
 
-send -- "sudo ls; sudo whoami; sudo pwd\r"
-expect {
-        timeout {puts "TESTING ERROR: you need to root run this test as root\n";exit}
-        "root"
-}
-
-send -- "pkill unbound\r"
-sleep 2
-
 send -- "firejail --name=unbound unbound\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}