From ddd307e3447e609241abadb8d073e97b948a5bb0 Mon Sep 17 00:00:00 2001
From: startx2017 <vradu.startx@yandex.com>
Date: Wed, 22 Aug 2018 08:32:01 -0400
Subject: removed --disable-bind configuration option; some ohter minor cleanup

---
 test/compile/compile.sh | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'test/compile')

diff --git a/test/compile/compile.sh b/test/compile/compile.sh
index 9d35bbcde..adacab616 100755
--- a/test/compile/compile.sh
+++ b/test/compile/compile.sh
@@ -3,7 +3,7 @@
 arr[1]="TEST 1: standard compilation"
 arr[2]="TEST 2: compile seccomp disabled"
 arr[3]="TEST 3: compile chroot disabled"
-arr[4]="TEST 4: compile bind disabled"
+arr[4]="deprecated: TEST 4: compile bind disabled"
 arr[5]="TEST 5: compile user namespace disabled"
 arr[6]="TEST 6: compile network disabled"
 arr[7]="TEST 7: compile X11 disabled"
@@ -14,7 +14,7 @@ arr[11]="TEST 11: compile disable global config"
 arr[12]="TEST 12: compile apparmor"
 arr[13]="TEST 13: compile busybox"
 arr[14]="TEST 14: compile overlayfs disabled"
-arr[15]="TEST 15: compile apparmor enabled"
+arr[14]="TEST 15: compile private-home disabled"
 
 # remove previous reports and output file
 cleanup() {
@@ -107,24 +107,6 @@ cp output-configure oc3
 cp output-make om3
 rm output-configure output-make
 
-#*****************************************************************
-# TEST 4
-#*****************************************************************
-# - disable bind configuration
-#*****************************************************************
-print_title "${arr[4]}"
-# seccomp
-cd firejail
-make distclean
-./configure --prefix=/usr --disable-bind  --enable-fatal-warnings 2>&1 | tee ../output-configure
-make -j4 2>&1 | tee ../output-make
-cd ..
-grep Warning output-configure output-make > ./report-test4
-grep Error output-configure output-make >> ./report-test4
-cp output-configure oc4
-cp output-make om4
-rm output-configure output-make
-
 #*****************************************************************
 # TEST 5
 #*****************************************************************
@@ -292,13 +274,13 @@ rm output-configure output-make
 #*****************************************************************
 # TEST 15
 #*****************************************************************
-# - enable apparmor
+# - disable private home
 #*****************************************************************
 print_title "${arr[15]}"
 # seccomp
 cd firejail
 make distclean
-./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-private-home --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test15
@@ -307,7 +289,6 @@ cp output-configure oc15
 cp output-make om15
 rm output-configure output-make
 
-
 #*****************************************************************
 # PRINT REPORTS
 #*****************************************************************
-- 
cgit v1.2.3-54-g00ecf