summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLibravatar startx2017 <vradu.startx@yandex.com>2018-08-22 08:32:01 -0400
committerLibravatar startx2017 <vradu.startx@yandex.com>2018-08-22 08:32:01 -0400
commitddd307e3447e609241abadb8d073e97b948a5bb0 (patch)
tree041028cc53f7ab392f124d68dff4cf3f11375de7 /test
parentrelax restrictions imposed on filesystem log (fslogger) in ec7f59b8d370c29bd2... (diff)
downloadfirejail-ddd307e3447e609241abadb8d073e97b948a5bb0.tar.gz
firejail-ddd307e3447e609241abadb8d073e97b948a5bb0.tar.zst
firejail-ddd307e3447e609241abadb8d073e97b948a5bb0.zip
removed --disable-bind configuration option; some ohter minor cleanup
Diffstat (limited to 'test')
-rwxr-xr-xtest/compile/compile.sh27
1 files changed, 4 insertions, 23 deletions
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 @@
3arr[1]="TEST 1: standard compilation" 3arr[1]="TEST 1: standard compilation"
4arr[2]="TEST 2: compile seccomp disabled" 4arr[2]="TEST 2: compile seccomp disabled"
5arr[3]="TEST 3: compile chroot disabled" 5arr[3]="TEST 3: compile chroot disabled"
6arr[4]="TEST 4: compile bind disabled" 6arr[4]="deprecated: TEST 4: compile bind disabled"
7arr[5]="TEST 5: compile user namespace disabled" 7arr[5]="TEST 5: compile user namespace disabled"
8arr[6]="TEST 6: compile network disabled" 8arr[6]="TEST 6: compile network disabled"
9arr[7]="TEST 7: compile X11 disabled" 9arr[7]="TEST 7: compile X11 disabled"
@@ -14,7 +14,7 @@ arr[11]="TEST 11: compile disable global config"
14arr[12]="TEST 12: compile apparmor" 14arr[12]="TEST 12: compile apparmor"
15arr[13]="TEST 13: compile busybox" 15arr[13]="TEST 13: compile busybox"
16arr[14]="TEST 14: compile overlayfs disabled" 16arr[14]="TEST 14: compile overlayfs disabled"
17arr[15]="TEST 15: compile apparmor enabled" 17arr[14]="TEST 15: compile private-home disabled"
18 18
19# remove previous reports and output file 19# remove previous reports and output file
20cleanup() { 20cleanup() {
@@ -108,24 +108,6 @@ cp output-make om3
108rm output-configure output-make 108rm output-configure output-make
109 109
110#***************************************************************** 110#*****************************************************************
111# TEST 4
112#*****************************************************************
113# - disable bind configuration
114#*****************************************************************
115print_title "${arr[4]}"
116# seccomp
117cd firejail
118make distclean
119./configure --prefix=/usr --disable-bind --enable-fatal-warnings 2>&1 | tee ../output-configure
120make -j4 2>&1 | tee ../output-make
121cd ..
122grep Warning output-configure output-make > ./report-test4
123grep Error output-configure output-make >> ./report-test4
124cp output-configure oc4
125cp output-make om4
126rm output-configure output-make
127
128#*****************************************************************
129# TEST 5 111# TEST 5
130#***************************************************************** 112#*****************************************************************
131# - disable user namespace configuration 113# - disable user namespace configuration
@@ -292,13 +274,13 @@ rm output-configure output-make
292#***************************************************************** 274#*****************************************************************
293# TEST 15 275# TEST 15
294#***************************************************************** 276#*****************************************************************
295# - enable apparmor 277# - disable private home
296#***************************************************************** 278#*****************************************************************
297print_title "${arr[15]}" 279print_title "${arr[15]}"
298# seccomp 280# seccomp
299cd firejail 281cd firejail
300make distclean 282make distclean
301./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure 283./configure --prefix=/usr --disable-private-home --enable-fatal-warnings 2>&1 | tee ../output-configure
302make -j4 2>&1 | tee ../output-make 284make -j4 2>&1 | tee ../output-make
303cd .. 285cd ..
304grep Warning output-configure output-make > ./report-test15 286grep Warning output-configure output-make > ./report-test15
@@ -307,7 +289,6 @@ cp output-configure oc15
307cp output-make om15 289cp output-make om15
308rm output-configure output-make 290rm output-configure output-make
309 291
310
311#***************************************************************** 292#*****************************************************************
312# PRINT REPORTS 293# PRINT REPORTS
313#***************************************************************** 294#*****************************************************************