From 2d0d9a4080a5fd54c4914227843ae3e609bad1cb Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@protonmail.com>
Date: Thu, 12 Jan 2023 11:33:47 -0500
Subject: rel 0.9.72 testing: cleanup make test-private-lib

---
 test/fs/fs.sh                    | 11 ---------
 test/fs/private-lib.exp          | 48 ----------------------------------------
 test/private-lib/private-lib.exp | 48 ++++++++++++++++++++++++++++++++++++++++
 test/private-lib/private-lib.sh  | 12 ++++++++++
 4 files changed, 60 insertions(+), 59 deletions(-)
 delete mode 100755 test/fs/private-lib.exp
 create mode 100755 test/private-lib/private-lib.exp

(limited to 'test')

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/fs/private-lib.exp
deleted file mode 100755
index 5290def35..000000000
--- a/test/fs/private-lib.exp
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
-# License GPL v2
-
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-send -- "firejail --private-lib --private-bin=sh,bash,dash,ps,grep,ls,find,echo,stty \r"
-expect {
-	timeout {puts "TESTING ERROR 1\n";exit}
-	-re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-after 100
-send -- "stty -echo\r"
-after 100
-
-send -- "cd /bin; find .\; echo done\r"
-expect {
-	timeout {puts "TESTING ERROR 2\n";exit}
-#	"grep" {puts "TESTING ERROR 3\n";exit}
-	"rm" {puts "TESTING ERROR 3\n";exit}
-	"cp" {puts "TESTING ERROR 4\n";exit}
-	"done"
-}
-after 100
-
-send -- "cd /lib; find .\r"
-expect {
-	timeout {puts "TESTING ERROR 5\n";exit}
-	"./modules" {puts "TESTING ERROR 6\n";exit}
-	"./firmware" {puts "TESTING ERROR 7\n";exit}
-	"libc.so"
-}
-after 100
-
-send -- "cd /usr/lib; find .\r"
-expect {
-	timeout {puts "TESTING ERROR 8\n";exit}
-	"grub" {puts "TESTING ERROR 9\n";exit}
-	"mozilla" {puts "TESTING ERROR 10\n";exit}
-	"libdl.so"
-}
-after 100
-
-puts "\nall done\n"
diff --git a/test/private-lib/private-lib.exp b/test/private-lib/private-lib.exp
new file mode 100755
index 000000000..5290def35
--- /dev/null
+++ b/test/private-lib/private-lib.exp
@@ -0,0 +1,48 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2022 Firejail Authors
+# License GPL v2
+
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail --private-lib --private-bin=sh,bash,dash,ps,grep,ls,find,echo,stty \r"
+expect {
+	timeout {puts "TESTING ERROR 1\n";exit}
+	-re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
+}
+after 100
+send -- "stty -echo\r"
+after 100
+
+send -- "cd /bin; find .\; echo done\r"
+expect {
+	timeout {puts "TESTING ERROR 2\n";exit}
+#	"grep" {puts "TESTING ERROR 3\n";exit}
+	"rm" {puts "TESTING ERROR 3\n";exit}
+	"cp" {puts "TESTING ERROR 4\n";exit}
+	"done"
+}
+after 100
+
+send -- "cd /lib; find .\r"
+expect {
+	timeout {puts "TESTING ERROR 5\n";exit}
+	"./modules" {puts "TESTING ERROR 6\n";exit}
+	"./firmware" {puts "TESTING ERROR 7\n";exit}
+	"libc.so"
+}
+after 100
+
+send -- "cd /usr/lib; find .\r"
+expect {
+	timeout {puts "TESTING ERROR 8\n";exit}
+	"grub" {puts "TESTING ERROR 9\n";exit}
+	"mozilla" {puts "TESTING ERROR 10\n";exit}
+	"libdl.so"
+}
+after 100
+
+puts "\nall done\n"
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
+
-- 
cgit v1.2.3-54-g00ecf