1 files changed, 16 insertions, 46 deletions

diff --git a/Makefile.in b/Makefile.in
index c00d20c64..5fbbfead9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,6 +74,7 @@ clean:
         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*
@@ -181,7 +182,7 @@ uninstall:
         @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 m4 platform contrib configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh.in 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_TEST = "test/Makefile.in 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"
 
 dist:
         mv config.status config.status.old
@@ -227,45 +228,11 @@ scan-build: clean
 # make test
 #
 
+TESTS=profiles private-lib apps apps-x11 apps-x11-xorg sysutils utils environment filters arguments fs fcopy fnetfilter
+TEST_TARGETS=$(patsubst %,test-%,$(TESTS))
 
-test-profiles:
-        cd test/profiles; ./profiles.sh | grep TESTING
-
-test-private-lib:
-        cd test/private-lib; ./private-lib.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-environment:
-        cd test/environment; ./environment.sh | grep TESTING
-
-test-filters:
-        cd test/filters; ./filters.sh | grep TESTING
-
-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-fnetfilter:
-        cd test/fnetfilter; ./fnetfilter.sh | grep TESTING
+$(TEST_TARGETS):
+        $(MAKE) -C test $(subst test-,,$@)
 
 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 test-arguments
         echo "TEST COMPLETE"
@@ -276,6 +243,9 @@ test-noprofiles: test-private-lib test-fcopy test-fnetfilter test-fs test-utils
 test-travis: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-filters test-arguments
         echo "TEST COMPLETE"
 
+test-github: test-fcopy test-fnetfilter test-utils test-sysutils test-environment test-arguments
+        echo "TEST COMPLETE"
+
 ##########################################
 # Individual tests, some of them require root access
 # The tests are very intrusive, by the time you are done
@@ -284,32 +254,32 @@ test-travis: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sy
 
 # a firejail-test account is required, public/private key setup
 test-ssh:
-        cd test/ssh; ./ssh.sh | grep TESTING
+        $(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-,,$@)
 
 # 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"