aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-08-05 17:33:09 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-08-05 17:33:09 -0400
commitababab246b4fe0a03d4d9a745fa6e040903d0c06 (patch)
treee532fc734b16a95f3a2aea3a0cdb496680d597f1
parentwhitelist test (diff)
downloadfirejail-ababab246b4fe0a03d4d9a745fa6e040903d0c06.tar.gz
firejail-ababab246b4fe0a03d4d9a745fa6e040903d0c06.tar.zst
firejail-ababab246b4fe0a03d4d9a745fa6e040903d0c06.zip
testing
-rw-r--r--src/firejail/fs_home.c3
-rwxr-xr-xtest/dist-compile/compile.sh21
2 files changed, 23 insertions, 1 deletions
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index 105092036..c1e983c16 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -340,7 +340,8 @@ int fs_copydir(const char *path, const struct stat *st, int ftype, struct FTW *s
340 340
341int fs_copydir(const char *path, const struct stat *st, int ftype, struct FTW *sftw) 341int fs_copydir(const char *path, const struct stat *st, int ftype, struct FTW *sftw)
342{ 342{
343 343(void) st;
344(void) sftw;
344 char *homedir = cfg.homedir; 345 char *homedir = cfg.homedir;
345 char *dest; 346 char *dest;
346 int srcbaselen = 0; 347 int srcbaselen = 0;
diff --git a/test/dist-compile/compile.sh b/test/dist-compile/compile.sh
index 6332bee9a..b33f0660a 100755
--- a/test/dist-compile/compile.sh
+++ b/test/dist-compile/compile.sh
@@ -11,6 +11,7 @@ arr[8]="TEST 8: compile network restricted"
11arr[9]="TEST 9: compile file transfer disabled" 11arr[9]="TEST 9: compile file transfer disabled"
12arr[10]="TEST 10: compile disable whitelist" 12arr[10]="TEST 10: compile disable whitelist"
13arr[11]="TEST 11: compile disable global config" 13arr[11]="TEST 11: compile disable global config"
14arr[12]="TEST 12: compile apparmor"
14 15
15# remove previous reports and output file 16# remove previous reports and output file
16cleanup() { 17cleanup() {
@@ -261,6 +262,25 @@ cp output-configure oc11
261cp output-make om11 262cp output-make om11
262rm output-configure output-make 263rm output-configure output-make
263 264
265#*****************************************************************
266# TEST 12
267#*****************************************************************
268# - enable apparmor
269# - check compilation
270#*****************************************************************
271print_title "${arr[11]}"
272# seccomp
273cd firejail
274make distclean
275./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure
276make -j4 2>&1 | tee ../output-make
277cd ..
278grep Warning output-configure output-make > ./report-test12
279grep Error output-configure output-make >> ./report-test12
280cp output-configure oc12
281cp output-make om12
282rm output-configure output-make
283
264 284
265#***************************************************************** 285#*****************************************************************
266# PRINT REPORTS 286# PRINT REPORTS
@@ -287,3 +307,4 @@ echo ${arr[8]}
287echo ${arr[9]} 307echo ${arr[9]}
288echo ${arr[10]} 308echo ${arr[10]}
289echo ${arr[11]} 309echo ${arr[11]}
310echo ${arr[12]}