appimage testing

1 files changed, 10 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 6814e8ddf..dbe084a2e 100644
--- a/Makefile
+++ b/Makefile
@@ -314,7 +314,7 @@ mkman.sh \
 platform \
 src
 
-DISTFILES_TEST = test/Makefile 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
+DISTFILES_TEST = test/Makefile test/apps test/apps-x11 test/apps-x11-xorg test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils
 
 .PHONY: dist
 dist: config.mk
@@ -372,7 +372,7 @@ $(TEST_TARGETS):
 
 
 # extract some data about the testing setup: kernel, network connectivity, user
-lab-setup:; uname -r; pwd; whoami; cat /etc/resolv.conf; cat /etc/hosts; ls /etc
+lab-setup:; uname -r; ldd --version | grep GLIBC; pwd; whoami; cat /etc/resolv.conf; cat /etc/hosts; ls /etc
 
 test: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-private-etc test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters
         echo "TEST COMPLETE"
@@ -380,6 +380,14 @@ test: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-private-et
 test-noprofiles: lab-setup 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"
 
+# not included in "make dist" and "make test"
+test-appimage:
+        $(MAKE) -C test $(subst test-,,$@)
+
+# not included in "make dist" and "make test"
+test-chroot:
+        $(MAKE) -C test $(subst test-,,$@)
+
 # old gihub test; the new test is driven directly from .github/workflows/build.yml
 test-github: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment
         echo "TEST COMPLETE"
@@ -393,21 +401,9 @@ test-github: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-uti
 test-private-lib:
         $(MAKE) -C test $(subst test-,,$@)
 
-# requires root access
-test-chroot:
-        $(MAKE) -C test $(subst test-,,$@)
-
-# Huge appimage files, not included in "make dist" archive
-test-appimage:
-        $(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:
         $(MAKE) -C test $(subst test-,,$@)
 
-# OverlayFS is not available on all platforms
-test-overlay:
-        $(MAKE) -C test $(subst test-,,$@)
-
 # For testing hidepid system, the command to set it up is "mount -o remount,rw,hidepid=2 /proc"