diff options
-rwxr-xr-x | test/compile/compile.sh | 46 | ||||
-rwxr-xr-x | test/environment/output.sh | 6 | ||||
-rwxr-xr-x | test/features/test.sh | 48 |
3 files changed, 50 insertions, 50 deletions
diff --git a/test/compile/compile.sh b/test/compile/compile.sh index 27e5b2d77..96a14d0cb 100755 --- a/test/compile/compile.sh +++ b/test/compile/compile.sh | |||
@@ -47,7 +47,7 @@ print_title() { | |||
47 | echo | 47 | echo |
48 | echo | 48 | echo |
49 | echo "**************************************************" | 49 | echo "**************************************************" |
50 | echo $1 | 50 | echo "$1" |
51 | echo "**************************************************" | 51 | echo "**************************************************" |
52 | } | 52 | } |
53 | 53 | ||
@@ -76,8 +76,8 @@ cleanup | |||
76 | #***************************************************************** | 76 | #***************************************************************** |
77 | print_title "${arr[1]}" | 77 | print_title "${arr[1]}" |
78 | echo "$DIST" | 78 | echo "$DIST" |
79 | tar -xJvf ../../$DIST.tar.xz | 79 | tar -xJvf ../../"$DIST.tar.xz" |
80 | mv $DIST firejail | 80 | mv "$DIST" firejail |
81 | 81 | ||
82 | cd firejail | 82 | cd firejail |
83 | ./configure --prefix=/usr --enable-fatal-warnings 2>&1 | tee ../output-configure | 83 | ./configure --prefix=/usr --enable-fatal-warnings 2>&1 | tee ../output-configure |
@@ -410,23 +410,23 @@ echo "**********************************************************" | |||
410 | 410 | ||
411 | wc -l report-test* | 411 | wc -l report-test* |
412 | echo | 412 | echo |
413 | echo "Legend:" | 413 | echo "Legend:" |
414 | echo ${arr[1]} | 414 | echo "${arr[1]}" |
415 | echo ${arr[2]} | 415 | echo "${arr[2]}" |
416 | echo ${arr[3]} | 416 | echo "${arr[3]}" |
417 | echo ${arr[4]} | 417 | echo "${arr[4]}" |
418 | echo ${arr[5]} | 418 | echo "${arr[5]}" |
419 | echo ${arr[6]} | 419 | echo "${arr[6]}" |
420 | echo ${arr[7]} | 420 | echo "${arr[7]}" |
421 | echo ${arr[8]} | 421 | echo "${arr[8]}" |
422 | echo ${arr[9]} | 422 | echo "${arr[9]}" |
423 | echo ${arr[10]} | 423 | echo "${arr[10]}" |
424 | echo ${arr[11]} | 424 | echo "${arr[11]}" |
425 | echo ${arr[12]} | 425 | echo "${arr[12]}" |
426 | echo ${arr[13]} | 426 | echo "${arr[13]}" |
427 | echo ${arr[14]} | 427 | echo "${arr[14]}" |
428 | echo ${arr[15]} | 428 | echo "${arr[15]}" |
429 | echo ${arr[16]} | 429 | echo "${arr[16]}" |
430 | echo ${arr[17]} | 430 | echo "${arr[17]}" |
431 | echo ${arr[18]} | 431 | echo "${arr[18]}" |
432 | echo ${arr[19]} | 432 | echo "${arr[19]}" |
diff --git a/test/environment/output.sh b/test/environment/output.sh index 329cb40c7..0872dc276 100755 --- a/test/environment/output.sh +++ b/test/environment/output.sh | |||
@@ -5,8 +5,8 @@ | |||
5 | 5 | ||
6 | i="0" | 6 | i="0" |
7 | 7 | ||
8 | while [ $i -lt 150000 ] | 8 | while [ $i -lt 150000 ] |
9 | do | 9 | do |
10 | echo message number $i | 10 | echo "message number $i" |
11 | i=$[$i+1] | 11 | i=$((i+1)) |
12 | done | 12 | done |
diff --git a/test/features/test.sh b/test/features/test.sh index b507c6d37..64cb78c21 100755 --- a/test/features/test.sh +++ b/test/features/test.sh | |||
@@ -38,28 +38,28 @@ done | |||
38 | # Default features | 38 | # Default features |
39 | #################### | 39 | #################### |
40 | echo "TESTING: 1.1 disable /boot" | 40 | echo "TESTING: 1.1 disable /boot" |
41 | ./1.1.exp $OVERLAY $CHROOT | 41 | ./1.1.exp "$OVERLAY" "$CHROOT" |
42 | 42 | ||
43 | echo "TESTING: 1.2 new /proc" | 43 | echo "TESTING: 1.2 new /proc" |
44 | ./1.2.exp $OVERLAY $CHROOT | 44 | ./1.2.exp "$OVERLAY" "$CHROOT" |
45 | 45 | ||
46 | echo "TESTING: 1.4 mask other users" | 46 | echo "TESTING: 1.4 mask other users" |
47 | ./1.4.exp $OVERLAY $CHROOT | 47 | ./1.4.exp "$OVERLAY" "$CHROOT" |
48 | 48 | ||
49 | echo "TESTING: 1.5 PID namespace" | 49 | echo "TESTING: 1.5 PID namespace" |
50 | ./1.5.exp $OVERLAY $CHROOT | 50 | ./1.5.exp "$OVERLAY" "$CHROOT" |
51 | 51 | ||
52 | echo "TESTING: 1.6 new /var/log" | 52 | echo "TESTING: 1.6 new /var/log" |
53 | ./1.6.exp $OVERLAY $CHROOT | 53 | ./1.6.exp "$OVERLAY" "$CHROOT" |
54 | 54 | ||
55 | echo "TESTING: 1.7 new /var/tmp" | 55 | echo "TESTING: 1.7 new /var/tmp" |
56 | ./1.7.exp $OVERLAY $CHROOT | 56 | ./1.7.exp "$OVERLAY" "$CHROOT" |
57 | 57 | ||
58 | echo "TESTING: 1.8 disable firejail config and run time information" | 58 | echo "TESTING: 1.8 disable firejail config and run time information" |
59 | ./1.8.exp $OVERLAY $CHROOT | 59 | ./1.8.exp "$OVERLAY" "$CHROOT" |
60 | 60 | ||
61 | echo "TESTING: 1.10 disable /selinux" | 61 | echo "TESTING: 1.10 disable /selinux" |
62 | ./1.10.exp $OVERLAY $CHROOT | 62 | ./1.10.exp "$OVERLAY" "$CHROOT" |
63 | 63 | ||
64 | #################### | 64 | #################### |
65 | # networking features | 65 | # networking features |
@@ -67,56 +67,56 @@ echo "TESTING: 1.10 disable /selinux" | |||
67 | if [ $NETWORK == "network" ] | 67 | if [ $NETWORK == "network" ] |
68 | then | 68 | then |
69 | echo "TESTING: 2.1 hostname" | 69 | echo "TESTING: 2.1 hostname" |
70 | ./2.1.exp $OVERLAY $CHROOT | 70 | ./2.1.exp "$OVERLAY" "$CHROOT" |
71 | 71 | ||
72 | echo "TESTING: 2.2 DNS" | 72 | echo "TESTING: 2.2 DNS" |
73 | ./2.2.exp $OVERLAY $CHROOT | 73 | ./2.2.exp "$OVERLAY" "$CHROOT" |
74 | 74 | ||
75 | echo "TESTING: 2.3 mac-vlan" | 75 | echo "TESTING: 2.3 mac-vlan" |
76 | ./2.3.exp $OVERLAY $CHROOT | 76 | ./2.3.exp "$OVERLAY" "$CHROOT" |
77 | 77 | ||
78 | echo "TESTING: 2.4 bridge" | 78 | echo "TESTING: 2.4 bridge" |
79 | ./2.4.exp $OVERLAY $CHROOT | 79 | ./2.4.exp "$OVERLAY" "$CHROOT" |
80 | 80 | ||
81 | echo "TESTING: 2.5 interface" | 81 | echo "TESTING: 2.5 interface" |
82 | ./2.5.exp $OVERLAY $CHROOT | 82 | ./2.5.exp "$OVERLAY" "$CHROOT" |
83 | 83 | ||
84 | echo "TESTING: 2.6 Default gateway" | 84 | echo "TESTING: 2.6 Default gateway" |
85 | ./2.6.exp $OVERLAY $CHROOT | 85 | ./2.6.exp "$OVERLAY" "$CHROOT" |
86 | fi | 86 | fi |
87 | 87 | ||
88 | #################### | 88 | #################### |
89 | # filesystem features | 89 | # filesystem features |
90 | #################### | 90 | #################### |
91 | echo "TESTING: 3.1 private (fails on OpenSUSE)" | 91 | echo "TESTING: 3.1 private (fails on OpenSUSE)" |
92 | ./3.1.exp $OVERLAY $CHROOT | 92 | ./3.1.exp "$OVERLAY" "$CHROOT" |
93 | 93 | ||
94 | echo "TESTING: 3.2 read-only" | 94 | echo "TESTING: 3.2 read-only" |
95 | ./3.2.exp $OVERLAY $CHROOT | 95 | ./3.2.exp "$OVERLAY" "$CHROOT" |
96 | 96 | ||
97 | echo "TESTING: 3.3 blacklist" | 97 | echo "TESTING: 3.3 blacklist" |
98 | ./3.3.exp $OVERLAY $CHROOT | 98 | ./3.3.exp "$OVERLAY" "$CHROOT" |
99 | 99 | ||
100 | echo "TESTING: 3.4 whitelist home (fails on OpenSUSE)" | 100 | echo "TESTING: 3.4 whitelist home (fails on OpenSUSE)" |
101 | ./3.4.exp $OVERLAY $CHROOT | 101 | ./3.4.exp "$OVERLAY" "$CHROOT" |
102 | 102 | ||
103 | echo "TESTING: 3.5 private-dev" | 103 | echo "TESTING: 3.5 private-dev" |
104 | ./3.5.exp $OVERLAY $CHROOT | 104 | ./3.5.exp "$OVERLAY" "$CHROOT" |
105 | 105 | ||
106 | echo "TESTING: 3.6 private-etc" | 106 | echo "TESTING: 3.6 private-etc" |
107 | ./3.6.exp notworking $CHROOT | 107 | ./3.6.exp notworking "$CHROOT" |
108 | 108 | ||
109 | echo "TESTING: 3.7 private-tmp" | 109 | echo "TESTING: 3.7 private-tmp" |
110 | ./3.7.exp $OVERLAY $CHROOT | 110 | ./3.7.exp "$OVERLAY" "$CHROOT" |
111 | 111 | ||
112 | echo "TESTING: 3.8 private-bin" | 112 | echo "TESTING: 3.8 private-bin" |
113 | ./3.8.exp notworking notworking | 113 | ./3.8.exp notworking notworking |
114 | 114 | ||
115 | echo "TESTING: 3.9 whitelist dev" | 115 | echo "TESTING: 3.9 whitelist dev" |
116 | ./3.9.exp $OVERLAY $CHROOT | 116 | ./3.9.exp "$OVERLAY" "$CHROOT" |
117 | 117 | ||
118 | echo "TESTING: 3.10 whitelist tmp" | 118 | echo "TESTING: 3.10 whitelist tmp" |
119 | ./3.10.exp $OVERLAY $CHROOT | 119 | ./3.10.exp "$OVERLAY" "$CHROOT" |
120 | 120 | ||
121 | echo "TESTING: 3.11 mkdir" | 121 | echo "TESTING: 3.11 mkdir" |
122 | ./3.11.exp $OVERLAY $CHROOT | 122 | ./3.11.exp "$OVERLAY" "$CHROOT" |