4 files changed, 18 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index c5d823cac..57a692817 100644
--- a/Makefile
+++ b/Makefile
@@ -268,16 +268,16 @@ scan-build: clean
 # make test
 #
 
-TESTS=profiles private-lib apps apps-x11 apps-x11-xorg sysutils utils environment filters fs fcopy fnetfilter
+TESTS=profiles apps apps-x11 apps-x11-xorg sysutils utils environment filters fs fcopy fnetfilter
 TEST_TARGETS=$(patsubst %,test-%,$(TESTS))
 
 $(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: test-profiles 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-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
+test-noprofiles: 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-github: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment
@@ -288,6 +288,9 @@ test-github: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sy
 # The tests are very intrusive, by the time you are done
 # with them you will need to restart your computer.
 ##########################################
+# private-lib is disabled by default in /etc/firejail/firejail.config
+test-private-lib:
+        $(MAKE) -C test $(subst test-,,$@)
 
 # a firejail-test account is required, public/private key setup
 test-ssh:
diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index 697c86d3d..677b753fc 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -45,17 +45,6 @@ echo "TESTING: read/write /var/tmp (test/fs/fs_var_tmp.exp)"
 ./fs_var_tmp.exp
 rm -f /var/tmp/_firejail_test_file
 
-if [[ $(uname -m) == "x86_64" ]]; then
-        fjconfig=/etc/firejail/firejail.config
-        printf 'private-lib yes\n' | sudo tee -a "$fjconfig" >/dev/null
-        echo "TESTING: private-lib (test/fs/private-lib.exp)"
-        ./private-lib.exp
-        printf '%s\n' "$(sed '/^private-lib yes$/d' "$fjconfig")" |
-                sudo tee "$fjconfig" >/dev/null
-else
-        echo "TESTING SKIP: private-lib test implemented only for x86_64."
-fi
-
 echo "TESTING: read/write /var/lock (test/fs/fs_var_lock.exp)"
 ./fs_var_lock.exp
 rm -f /var/lock/_firejail_test_file
diff --git a/test/fs/private-lib.exp b/test/private-lib/private-lib.exp
index 5290def35..5290def35 100755
--- a/test/fs/private-lib.exp
+++ b/test/private-lib/private-lib.exp
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh
index 6b7d433c8..43c42a098 100755
--- a/test/private-lib/private-lib.sh
+++ b/test/private-lib/private-lib.sh
@@ -18,3 +18,15 @@ for app in "${apps[@]}"; do
                 echo "TESTING SKIP: $app not found"
         fi
 done
+
+if [[ $(uname -m) == "x86_64" ]]; then
+        fjconfig=/etc/firejail/firejail.config
+        printf 'private-lib yes\n' | sudo tee -a "$fjconfig" >/dev/null
+        echo "TESTING: private-lib (test/fs/private-lib.exp)"
+        ./private-lib.exp
+        printf '%s\n' "$(sed '/^private-lib yes$/d' "$fjconfig")" |
+                sudo tee "$fjconfig" >/dev/null
+else
+        echo "TESTING SKIP: private-lib test implemented only for x86_64."
+fi
+