diff options
-rwxr-xr-x | test/test.sh | 27 | ||||
-rwxr-xr-x | test/utils/catchsignal-master.sh (renamed from test/catchsignal-master.sh) | 0 | ||||
-rwxr-xr-x | test/utils/catchsignal.sh (renamed from test/catchsignal.sh) | 0 | ||||
-rwxr-xr-x | test/utils/catchsignal2.sh (renamed from test/catchsignal2.sh) | 0 | ||||
-rwxr-xr-x | test/utils/join-profile.exp (renamed from test/option-join-profile.exp) | 0 | ||||
-rwxr-xr-x | test/utils/join.exp (renamed from test/option-join.exp) | 3 | ||||
-rwxr-xr-x | test/utils/join2.exp (renamed from test/option-join2.exp) | 3 | ||||
-rwxr-xr-x | test/utils/join3.exp (renamed from test/option-join3.exp) | 3 | ||||
-rw-r--r-- | test/utils/name.profile (renamed from test/name.profile) | 0 | ||||
-rwxr-xr-x | test/utils/shutdown.exp (renamed from test/option-shutdown.exp) | 3 | ||||
-rwxr-xr-x | test/utils/shutdown2.exp (renamed from test/option-shutdown2.exp) | 3 | ||||
-rwxr-xr-x | test/utils/shutdown3.exp (renamed from test/option-shutdown3.exp) | 3 | ||||
-rwxr-xr-x | test/utils/shutdown4.exp (renamed from test/option-shutdown4.exp) | 3 | ||||
-rwxr-xr-x | test/utils/utils.sh | 24 |
14 files changed, 48 insertions, 24 deletions
diff --git a/test/test.sh b/test/test.sh index c88b8d486..ba5268036 100755 --- a/test/test.sh +++ b/test/test.sh | |||
@@ -1,4 +1,7 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2016 Firejail Authors | ||
4 | # License GPL v2 | ||
2 | 5 | ||
3 | ./chk_config.exp | 6 | ./chk_config.exp |
4 | 7 | ||
@@ -96,30 +99,6 @@ echo "TESTING: kmsg access (kmsg.exp)" | |||
96 | echo "TESTING: rlimit (option_rlimit.exp)" | 99 | echo "TESTING: rlimit (option_rlimit.exp)" |
97 | ./option_rlimit.exp | 100 | ./option_rlimit.exp |
98 | 101 | ||
99 | echo "TESTING: shutdown (option_shutdown.exp)" | ||
100 | ./option-shutdown.exp | ||
101 | |||
102 | echo "TESTING: shutdown2 (option_shutdown2.exp)" | ||
103 | ./option-shutdown2.exp | ||
104 | |||
105 | echo "TESTING: shutdown3 (option_shutdown3.exp)" | ||
106 | ./option-shutdown3.exp | ||
107 | |||
108 | echo "TESTING: shutdown4 (option_shutdown4.exp)" | ||
109 | ./option-shutdown4.exp | ||
110 | |||
111 | echo "TESTING: join (option-join.exp)" | ||
112 | ./option-join.exp | ||
113 | |||
114 | echo "TESTING: join2 (option-join2.exp)" | ||
115 | ./option-join2.exp | ||
116 | |||
117 | echo "TESTING: join3 (option-join3.exp)" | ||
118 | ./option-join3.exp | ||
119 | |||
120 | echo "TESTING: join profile (option-join-profile.exp)" | ||
121 | ./option-join-profile.exp | ||
122 | |||
123 | echo "TESTING: firejail in firejail - single sandbox (firejail-in-firejail.exp)" | 102 | echo "TESTING: firejail in firejail - single sandbox (firejail-in-firejail.exp)" |
124 | ./firejail-in-firejail.exp | 103 | ./firejail-in-firejail.exp |
125 | 104 | ||
diff --git a/test/catchsignal-master.sh b/test/utils/catchsignal-master.sh index 62a1801cc..62a1801cc 100755 --- a/test/catchsignal-master.sh +++ b/test/utils/catchsignal-master.sh | |||
diff --git a/test/catchsignal.sh b/test/utils/catchsignal.sh index 87a1d0adf..87a1d0adf 100755 --- a/test/catchsignal.sh +++ b/test/utils/catchsignal.sh | |||
diff --git a/test/catchsignal2.sh b/test/utils/catchsignal2.sh index 424350397..424350397 100755 --- a/test/catchsignal2.sh +++ b/test/utils/catchsignal2.sh | |||
diff --git a/test/option-join-profile.exp b/test/utils/join-profile.exp index 9200980a1..9200980a1 100755 --- a/test/option-join-profile.exp +++ b/test/utils/join-profile.exp | |||
diff --git a/test/option-join.exp b/test/utils/join.exp index 6250e87a2..fc94a22c3 100755 --- a/test/option-join.exp +++ b/test/utils/join.exp | |||
@@ -1,4 +1,7 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2016 Firejail Authors | ||
4 | # License GPL v2 | ||
2 | 5 | ||
3 | set timeout 10 | 6 | set timeout 10 |
4 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
diff --git a/test/option-join2.exp b/test/utils/join2.exp index 630b62d9e..749e8900f 100755 --- a/test/option-join2.exp +++ b/test/utils/join2.exp | |||
@@ -1,4 +1,7 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2016 Firejail Authors | ||
4 | # License GPL v2 | ||
2 | 5 | ||
3 | set timeout 10 | 6 | set timeout 10 |
4 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
diff --git a/test/option-join3.exp b/test/utils/join3.exp index aa8a445df..0a686bc36 100755 --- a/test/option-join3.exp +++ b/test/utils/join3.exp | |||
@@ -1,4 +1,7 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2016 Firejail Authors | ||
4 | # License GPL v2 | ||
2 | 5 | ||
3 | set timeout 10 | 6 | set timeout 10 |
4 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
diff --git a/test/name.profile b/test/utils/name.profile index 1aa9f2d64..1aa9f2d64 100644 --- a/test/name.profile +++ b/test/utils/name.profile | |||
diff --git a/test/option-shutdown.exp b/test/utils/shutdown.exp index e869f7611..135f42d28 100755 --- a/test/option-shutdown.exp +++ b/test/utils/shutdown.exp | |||
@@ -1,4 +1,7 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2016 Firejail Authors | ||
4 | # License GPL v2 | ||
2 | 5 | ||
3 | set timeout 10 | 6 | set timeout 10 |
4 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
diff --git a/test/option-shutdown2.exp b/test/utils/shutdown2.exp index 403bc30be..7857b919c 100755 --- a/test/option-shutdown2.exp +++ b/test/utils/shutdown2.exp | |||
@@ -1,4 +1,7 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2016 Firejail Authors | ||
4 | # License GPL v2 | ||
2 | 5 | ||
3 | set timeout 10 | 6 | set timeout 10 |
4 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
diff --git a/test/option-shutdown3.exp b/test/utils/shutdown3.exp index 0ef371cd8..02b68c4ce 100755 --- a/test/option-shutdown3.exp +++ b/test/utils/shutdown3.exp | |||
@@ -1,4 +1,7 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2016 Firejail Authors | ||
4 | # License GPL v2 | ||
2 | 5 | ||
3 | set timeout 10 | 6 | set timeout 10 |
4 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
diff --git a/test/option-shutdown4.exp b/test/utils/shutdown4.exp index f188ec66d..613f3fbc8 100755 --- a/test/option-shutdown4.exp +++ b/test/utils/shutdown4.exp | |||
@@ -1,4 +1,7 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2016 Firejail Authors | ||
4 | # License GPL v2 | ||
2 | 5 | ||
3 | set timeout 10 | 6 | set timeout 10 |
4 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
diff --git a/test/utils/utils.sh b/test/utils/utils.sh index 02aaa57c0..a40845a5f 100755 --- a/test/utils/utils.sh +++ b/test/utils/utils.sh | |||
@@ -40,3 +40,27 @@ echo "TESTING: seccomp.print (test/utils/seccomp-print.exp)" | |||
40 | echo "TESTING: protocol.print (test/utils/protocol-print.exp)" | 40 | echo "TESTING: protocol.print (test/utils/protocol-print.exp)" |
41 | ./protocol-print.exp | 41 | ./protocol-print.exp |
42 | 42 | ||
43 | echo "TESTING: shutdown (test/utils/shutdown.exp)" | ||
44 | ./shutdown.exp | ||
45 | |||
46 | echo "TESTING: shutdown2 (test/utils/shutdown2.exp)" | ||
47 | ./shutdown2.exp | ||
48 | |||
49 | echo "TESTING: shutdown3 (test/utils/shutdown3.exp)" | ||
50 | ./shutdown3.exp | ||
51 | |||
52 | echo "TESTING: shutdown4 (test/utils/shutdown4.exp)" | ||
53 | ./shutdown4.exp | ||
54 | |||
55 | echo "TESTING: join test/utils/(join.exp)" | ||
56 | ./join.exp | ||
57 | |||
58 | echo "TESTING: join2 test/utils/(join2.exp)" | ||
59 | .join2.exp | ||
60 | |||
61 | echo "TESTING: join3 (test/utils/join3.exp)" | ||
62 | ./join3.exp | ||
63 | |||
64 | echo "TESTING: join profile (test/utils/join-profile.exp)" | ||
65 | ./join-profile.exp | ||
66 | |||