1 files changed, 142 insertions, 161 deletions

diff --git a/Makefile.in b/Makefile.in
index be5ab837f..c94d8c7a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,3 @@
-all: apps man filters
-MYLIBS = src/lib
-APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit src/fnet src/fseccomp src/fbuilder src/fcopy src/fldd src/libpostexecseccomp
-MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5
-SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.64 seccomp.block_secondary seccomp.mdwx
-
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
@@ -16,43 +10,75 @@ VERSION=@PACKAGE_VERSION@
 NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 DOCDIR=@docdir@
-HAVE_SECCOMP=@HAVE_SECCOMP@
 HAVE_APPARMOR=@HAVE_APPARMOR@
 HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
-HAVE_GIT_INSTALL=@HAVE_GIT_INSTALL@
 BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
+HAVE_SUID=@HAVE_SUID@
+HAVE_MAN=@HAVE_MAN@
 
-uids.h:; ./mkuid.sh
-
-.PHONY: mylibs $(MYLIBS)
-mylibs: $(MYLIBS) uids.h
-$(MYLIBS):
-        $(MAKE) -C $@
+ifneq ($(HAVE_MAN),no)
+MAN_TARGET = man
+MAN_SRC = src/man
+endif
 
-.PHONY: apps $(APPS)
-apps: $(APPS)
-$(APPS): $(MYLIBS) uids.h
+COMPLETIONDIRS = src/zsh_completion src/bash_completion
+
+.PHONY: all
+all: all_items mydirs $(MAN_TARGET) filters
+APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats src/jailcheck/jailcheck
+SBOX_APPS = src/fbuilder/fbuilder src/ftee/ftee src/fids/fids
+SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter
+MYDIRS = src/lib $(MAN_SRC) $(COMPLETIONDIRS)
+MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so
+COMPLETIONS = src/zsh_completion/_firejail src/bash_completion/firejail.bash_completion
+MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 jailcheck.1
+SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp
+SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32
+ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS)
+
+.PHONY: all_items $(ALL_ITEMS)
+all_items: $(ALL_ITEMS)
+$(ALL_ITEMS): $(MYDIRS)
+        $(MAKE) -C $(dir $@)
+
+.PHONY: mydirs $(MYDIRS)
+mydirs: $(MYDIRS)
+$(MYDIRS):
         $(MAKE) -C $@
 
-$(MANPAGES): $(wildcard src/man/*.txt)
-        ./mkman.sh $(VERSION) src/man/$(basename $@).txt $@
+$(MANPAGES): src/man
+        ./mkman.sh $(VERSION) src/man/$(basename $@).man $@
 
 man: $(MANPAGES)
 
-filters: src/fseccomp
-ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP)
+filters: $(SECCOMP_FILTERS) $(SBOX_APPS_NON_DUMPABLE)
+seccomp: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize
         src/fseccomp/fseccomp default seccomp
+        src/fsec-optimize/fsec-optimize seccomp
+
+seccomp.debug: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize
         src/fseccomp/fseccomp default seccomp.debug allow-debuggers
+        src/fsec-optimize/fsec-optimize seccomp.debug
+
+seccomp.32: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize
         src/fseccomp/fseccomp secondary 32 seccomp.32
-        src/fseccomp/fseccomp secondary 64 seccomp.64
+        src/fsec-optimize/fsec-optimize seccomp.32
+
+seccomp.block_secondary: src/fseccomp/fseccomp
         src/fseccomp/fseccomp secondary block seccomp.block_secondary
+
+seccomp.mdwx: src/fseccomp/fseccomp
         src/fseccomp/fseccomp memory-deny-write-execute seccomp.mdwx
-endif
 
+seccomp.mdwx.32: src/fseccomp/fseccomp
+        src/fseccomp/fseccomp memory-deny-write-execute.32 seccomp.mdwx.32
+
+.PHONY: clean
 clean:
-        for dir in $(APPS) $(MYLIBS); do \
+        for dir in $$(dirname $(ALL_ITEMS)) $(MYDIRS); do \
                 $(MAKE) -C $$dir clean; \
         done
+        $(MAKE) -C test clean
         rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm
         rm -f $(SECCOMP_FILTERS)
         rm -f test/utils/index.html*
@@ -67,132 +93,114 @@ clean:
         rm -f test/sysutils/firejail_t*
         cd test/compile; ./compile.sh --clean; cd ../..
 
+.PHONY: distclean
 distclean: clean
-        for dir in $(APPS) $(MYLIBS); do \
+        for dir in $$(dirname $(ALL_ITEMS)) $(MYDIRS); do \
                 $(MAKE) -C $$dir distclean; \
         done
-        rm -fr Makefile autom4te.cache config.log config.status config.h uids.h
+        $(MAKE) -C test distclean
+        rm -fr Makefile autom4te.cache config.log config.status config.h src/common.mk mkdeb.sh
 
 realinstall:
         # firejail executable
-        install -m 0755 -d $(DESTDIR)/$(bindir)
-        install -c -m 0755 src/firejail/firejail $(DESTDIR)/$(bindir)/.
-        chmod u+s $(DESTDIR)/$(bindir)/firejail
+        install -m 0755 -d $(DESTDIR)$(bindir)
+        install -m 0755 src/firejail/firejail $(DESTDIR)$(bindir)
+ifeq ($(HAVE_SUID),yes)
+        chmod u+s $(DESTDIR)$(bindir)/firejail
+endif
         # firemon executable
-        install -c -m 0755 src/firemon/firemon $(DESTDIR)/$(bindir)/.
+        install -m 0755 src/firemon/firemon $(DESTDIR)$(bindir)
         # firecfg executable
-        install -c -m 0755 src/firecfg/firecfg $(DESTDIR)/$(bindir)/.
+        install -m 0755 src/firecfg/firecfg $(DESTDIR)$(bindir)
+        # jailcheck executable
+        install -m 0755 src/jailcheck/jailcheck $(DESTDIR)$(bindir)
         # libraries and plugins
-        install -m 0755 -d $(DESTDIR)/$(libdir)/firejail
-        install -c -m 0644 src/libtrace/libtrace.so $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0644 src/libtracelog/libtracelog.so $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0644 src/libpostexecseccomp/libpostexecseccomp.so $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 src/ftee/ftee $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 src/fshaper/fshaper.sh $(DESTDIR)/$(libdir)/firejail/.
-ifeq ($(HAVE_GIT_INSTALL),-DHAVE_GIT_INSTALL)
-        install -c -m 0755 src/fgit/fgit-install.sh $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 src/fgit/fgit-uninstall.sh $(DESTDIR)/$(libdir)/firejail/.
-endif
-
-        install -c -m 0644 src/firecfg/firecfg.config $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 src/faudit/faudit $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 src/fnet/fnet $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 src/fcopy/fcopy $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 src/fldd/fldd $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 src/fbuilder/fbuilder $(DESTDIR)/$(libdir)/firejail/.
-ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP)
-        install -c -m 0755 src/fseccomp/fseccomp $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0644 seccomp $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0644 seccomp.debug $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0644 seccomp.32 $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0644 seccomp.64 $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0644 seccomp.block_secondary $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0644 seccomp.mdwx $(DESTDIR)/$(libdir)/firejail/.
-endif
+        install -m 0755 -d $(DESTDIR)$(libdir)/firejail
+        install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS) src/firecfg/firecfg.config
+        install -m 0755 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS)
+        # plugins w/o read permission (non-dumpable)
+        install -m 0711 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS_NON_DUMPABLE)
+        install -m 0711 -t $(DESTDIR)$(libdir)/firejail src/fshaper/fshaper.sh
 ifeq ($(HAVE_CONTRIB_INSTALL),yes)
-        install -c -m 0755 contrib/fix_private-bin.py $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 contrib/fjclip.py $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 contrib/fjdisplay.py $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 contrib/fjresize.py $(DESTDIR)/$(libdir)/firejail/.
-        install -c -m 0755 contrib/fj-mkdeb.py $(DESTDIR)/$(libdir)/firejail/.
+        # contrib scripts
+        install -m 0755 -t $(DESTDIR)$(libdir)/firejail contrib/*.py contrib/*.sh
+        # vim syntax
+        install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect
+        install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax
+        install -m 0644 contrib/vim/ftdetect/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect
+        install -m 0644 contrib/vim/syntax/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax
 endif
         # documents
-        install -m 0755 -d $(DESTDIR)/$(DOCDIR)
-        install -c -m 0644 COPYING $(DESTDIR)/$(DOCDIR)/.
-        install -c -m 0644 README $(DESTDIR)/$(DOCDIR)/.
-        install -c -m 0644 RELNOTES $(DESTDIR)/$(DOCDIR)/.
-        # etc files
-        ./mketc.sh $(sysconfdir) $(BUSYBOX_WORKAROUND)
-        install -m 0755 -d $(DESTDIR)/$(sysconfdir)/firejail
-        for file in .etc/* etc/firejail.config; do \
-                install -c -m 0644 $$file $(DESTDIR)/$(sysconfdir)/firejail; \
-        done
+        install -m 0755 -d $(DESTDIR)$(DOCDIR)
+        install -m 0644 -t $(DESTDIR)$(DOCDIR) COPYING README RELNOTES etc/templates/*
+        # profiles and settings
+        install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail
+        install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/profile-a-l/*.profile etc/profile-m-z/*.profile etc/inc/*.inc etc/net/*.net etc/firejail.config etc/ids.config
         sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
-        rm -fr .etc
+ifeq ($(BUSYBOX_WORKAROUND),yes)
+        ./mketc.sh $(DESTDIR)$(sysconfdir)/firejail/disable-common.inc
+endif
 ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR)
         # install apparmor profile
         sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;"
-        install -c -m 0644 etc/firejail-default $(DESTDIR)/$(sysconfdir)/apparmor.d/.
+        install -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d
         sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d/local ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d/local; fi;"
-        install -c -m 0644 etc/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/.
+        # install apparmor profile customization file
+        sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default ]; then install -c -m 0644 etc/apparmor/firejail-local $(DESTDIR)/$(sysconfdir)/apparmor.d/local/firejail-default; fi;"
 endif
+ifneq ($(HAVE_MAN),no)
         # man pages
-        install -m 0755 -d $(DESTDIR)/$(mandir)/man1
-        install -m 0755 -d $(DESTDIR)/$(mandir)/man5
+        install -m 0755 -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5
         for man in $(MANPAGES); do \
                 rm -f $$man.gz; \
                 gzip -9n $$man; \
                 case "$$man" in \
-                        *.1) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man1/; ;; \
-                        *.5) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man5/; ;; \
+                        *.1) install -m 0644 $$man.gz $(DESTDIR)$(mandir)/man1/; ;; \
+                        *.5) install -m 0644 $$man.gz $(DESTDIR)$(mandir)/man5/; ;; \
                 esac; \
         done
         rm -f $(MANPAGES) $(MANPAGES:%=%.gz)
+endif
         # bash completion
-        install -m 0755 -d $(DESTDIR)/$(datarootdir)/bash-completion/completions
-        install -c -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail
-        install -c -m 0644 src/bash_completion/firemon.bash_completion $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon
-        install -c -m 0644 src/bash_completion/firecfg.bash_completion $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg
+        install -m 0755 -d $(DESTDIR)$(datarootdir)/bash-completion/completions
+        install -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firejail
+        install -m 0644 src/bash_completion/firemon.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firemon
+        install -m 0644 src/bash_completion/firecfg.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg
+        # zsh completion
+        install -m 0755 -d $(DESTDIR)$(datarootdir)/zsh/site-functions
+        install -m 0644 src/zsh_completion/_firejail $(DESTDIR)$(datarootdir)/zsh/site-functions/
 
 install: all
         $(MAKE) realinstall
 
 install-strip: all
-        strip src/firejail/firejail
-        strip src/firemon/firemon
-        strip src/firecfg/firecfg
-        strip src/libtrace/libtrace.so
-        strip src/libtracelog/libtracelog.so
-        strip src/libpostexecseccomp/libpostexecseccomp.so
-        strip src/ftee/ftee
-        strip src/faudit/faudit
-        strip src/fnet/fnet
-        strip src/fseccomp/fseccomp
-        strip src/fcopy/fcopy
-        strip src/fldd/fldd
-        strip src/fbuilder/fbuilder
+        strip $(ALL_ITEMS)
         $(MAKE) realinstall
 
 uninstall:
-        rm -f $(DESTDIR)/$(bindir)/firejail
-        rm -f $(DESTDIR)/$(bindir)/firemon
-        rm -f $(DESTDIR)/$(bindir)/firecfg
-        rm -fr $(DESTDIR)/$(libdir)/firejail
-        rm -fr $(DESTDIR)/$(datarootdir)/doc/firejail
+        rm -f $(DESTDIR)$(bindir)/firejail
+        rm -f $(DESTDIR)$(bindir)/firemon
+        rm -f $(DESTDIR)$(bindir)/firecfg
+        rm -fr $(DESTDIR)$(libdir)/firejail
+        rm -fr $(DESTDIR)$(libdir)/jailcheck
+        rm -fr $(DESTDIR)$(datarootdir)/doc/firejail
         for man in $(MANPAGES); do \
-                rm -f $(DESTDIR)/$(mandir)/man5/$$man*; \
-                rm -f $(DESTDIR)/$(mandir)/man1/$$man*; \
+                rm -f $(DESTDIR)$(mandir)/man5/$$man*; \
+                rm -f $(DESTDIR)$(mandir)/man1/$$man*; \
         done
-        rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail
-        rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon
-        rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg
+        rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/firejail
+        rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/firemon
+        rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg
+        @echo "If you want to install a different version of firejail, you might also need to run 'rm -fr $(DESTDIR)$(sysconfdir)/firejail', see #2038."
 
-DISTFILES = "src etc platform contrib 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/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils test/chroot"
+DISTFILES = "src etc m4 platform contrib configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh.in COPYING README RELNOTES"
+DISTFILES_TEST = "test/Makefile.in test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot"
 
 dist:
         mv config.status config.status.old
+        mv mkdeb.sh mkdeb.sh.old
         make distclean
+        mv mkdeb.sh.old mkdeb.sh
         mv config.status.old config.status
         rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz
         mkdir -p $(NAME)-$(VERSION)/test
@@ -206,107 +214,80 @@ dist:
 asc:; ./mkasc.sh $(VERSION)
 
 deb: dist
-        ./mkdeb.sh $(NAME) $(VERSION)
-
-snap: all
-        cd platform/snap; ./snap.sh
+        ./mkdeb.sh
 
-install-snap: snap
-        sudo snap remove faudit; sudo snap install faudit*.snap
+deb-apparmor: dist
+        ./mkdeb.sh -apparmor
 
 test-compile: dist
         cd test/compile; ./compile.sh $(NAME)-$(VERSION)
 
 .PHONY: rpms
-rpms:
+rpms: src/man
         ./platform/rpm/mkrpm.sh $(NAME) $(VERSION)
 
 extras: all
         $(MAKE) -C extras/firetools
 
 cppcheck: clean
-        cppcheck --force .
+        cppcheck --force --error-exitcode=1 --enable=warning,performance .
 
 scan-build: clean
-        scan-build make
-
+        NO_EXTRA_CFLAGS="yes" scan-build make
 
 #
 # make test
 #
 
+TESTS=profiles private-lib apps apps-x11 apps-x11-xorg sysutils utils environment filters fs fcopy fnetfilter
+TEST_TARGETS=$(patsubst %,test-%,$(TESTS))
 
-test-profiles:
-        cd test/profiles; ./profiles.sh | grep TESTING
-
-test-apps:
-        cd test/apps; ./apps.sh | grep TESTING
-
-test-apps-x11:
-        cd test/apps-x11; ./apps-x11.sh | grep TESTING
-
-test-apps-x11-xorg:
-        cd test/apps-x11-xorg; ./apps-x11-xorg.sh | grep TESTING
-
-test-sysutils:
-        cd test/sysutils; ./sysutils.sh | grep TESTING
-
-test-utils:
-        cd test/utils; ./utils.sh | grep TESTING
+$(TEST_TARGETS):
+        $(MAKE) -C test $(subst test-,,$@)
 
-test-environment:
-        cd test/environment; ./environment.sh | grep TESTING
-
-test-filters:
-ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP)
-        cd test/filters; ./filters.sh | grep TESTING
-endif
-
-test-arguments:
-        cd test/arguments; ./arguments.sh | grep TESTING
-
-test-fs:
-        cd test/fs; ./fs.sh | grep TESTING
-
-test-fcopy:
-        cd test/fcopy; ./fcopy.sh | grep TESTING
+test: test-profiles test-private-lib test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters
+        echo "TEST COMPLETE"
 
-test: test-profiles test-fcopy test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments
+test-noprofiles: test-private-lib test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters
         echo "TEST COMPLETE"
 
-test-travis: test-profiles test-fcopy test-fs test-utils test-sysutils test-environment test-filters test-arguments
+test-github: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment
         echo "TEST COMPLETE"
 
 ##########################################
 # Individual tests, some of them require root access
-# The tests are very intrussive, by the time you are done
+# The tests are very intrusive, by the time you are done
 # with them you will need to restart your computer.
 ##########################################
 
+# a firejail-test account is required, public/private key setup
+test-ssh:
+        $(MAKE) -C test $(subst test-,,$@)
+
 # requires root access
 test-chroot:
-        cd test/chroot; ./chroot.sh | grep testing
+        $(MAKE) -C test $(subst test-,,$@)
 
 # Huge appimage files, not included in "make dist" archive
 test-appimage:
-        cd test/appimage; ./appimage.sh | grep TESTING
+        $(MAKE) -C test $(subst test-,,$@)
 
 # Root access, network devices are created before the test
 # restart your computer to get rid of these devices
 test-network:
-        cd test/network; ./network.sh | grep TESTING
+        $(MAKE) -C test $(subst test-,,$@)
 
 # requires the same setup as test-network
 test-stress:
-        cd test/stress; ./stress.sh | grep TESTING
+        $(MAKE) -C test $(subst test-,,$@)
 
-# Tesets running a root user
+# Tests running a root user
 test-root:
-        cd test/root; su -c ./root.sh | grep TESTING
+        $(MAKE) -C test $(subst test-,,$@)
 
 # OverlayFS is not available on all platforms
 test-overlay:
-        cd test/overlay; ./overlay.sh | grep TESTING
+        $(MAKE) -C test $(subst test-,,$@)
 
 # For testing hidepid system, the command to set it up is "mount -o remount,rw,hidepid=2 /proc"