diff options
-rw-r--r-- | src/firejail/fs_home.c | 3 | ||||
-rwxr-xr-x | test/dist-compile/compile.sh | 21 |
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 | ||
341 | int fs_copydir(const char *path, const struct stat *st, int ftype, struct FTW *sftw) | 341 | int 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" | |||
11 | arr[9]="TEST 9: compile file transfer disabled" | 11 | arr[9]="TEST 9: compile file transfer disabled" |
12 | arr[10]="TEST 10: compile disable whitelist" | 12 | arr[10]="TEST 10: compile disable whitelist" |
13 | arr[11]="TEST 11: compile disable global config" | 13 | arr[11]="TEST 11: compile disable global config" |
14 | arr[12]="TEST 12: compile apparmor" | ||
14 | 15 | ||
15 | # remove previous reports and output file | 16 | # remove previous reports and output file |
16 | cleanup() { | 17 | cleanup() { |
@@ -261,6 +262,25 @@ cp output-configure oc11 | |||
261 | cp output-make om11 | 262 | cp output-make om11 |
262 | rm output-configure output-make | 263 | rm output-configure output-make |
263 | 264 | ||
265 | #***************************************************************** | ||
266 | # TEST 12 | ||
267 | #***************************************************************** | ||
268 | # - enable apparmor | ||
269 | # - check compilation | ||
270 | #***************************************************************** | ||
271 | print_title "${arr[11]}" | ||
272 | # seccomp | ||
273 | cd firejail | ||
274 | make distclean | ||
275 | ./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure | ||
276 | make -j4 2>&1 | tee ../output-make | ||
277 | cd .. | ||
278 | grep Warning output-configure output-make > ./report-test12 | ||
279 | grep Error output-configure output-make >> ./report-test12 | ||
280 | cp output-configure oc12 | ||
281 | cp output-make om12 | ||
282 | rm output-configure output-make | ||
283 | |||
264 | 284 | ||
265 | #***************************************************************** | 285 | #***************************************************************** |
266 | # PRINT REPORTS | 286 | # PRINT REPORTS |
@@ -287,3 +307,4 @@ echo ${arr[8]} | |||
287 | echo ${arr[9]} | 307 | echo ${arr[9]} |
288 | echo ${arr[10]} | 308 | echo ${arr[10]} |
289 | echo ${arr[11]} | 309 | echo ${arr[11]} |
310 | echo ${arr[12]} | ||