aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLibravatar Topi Miettinen <toiwoton@gmail.com>2017-09-02 14:05:31 +0300
committerLibravatar Topi Miettinen <toiwoton@gmail.com>2017-09-02 14:05:31 +0300
commitcb5d361a7b52844bb18346f1829b69b4b7084439 (patch)
treea5c75843eca9db0ee432dde47454f2ec06224fb8 /test
parentWorkaround for build problems, but correct problem this time (diff)
downloadfirejail-cb5d361a7b52844bb18346f1829b69b4b7084439.tar.gz
firejail-cb5d361a7b52844bb18346f1829b69b4b7084439.tar.zst
firejail-cb5d361a7b52844bb18346f1829b69b4b7084439.zip
Improve seccomp support for non-x86 architectures
Diffstat (limited to 'test')
-rwxr-xr-xtest/filters/seccomp-debug-32.exp16
-rwxr-xr-xtest/filters/seccomp-debug.exp28
2 files changed, 22 insertions, 22 deletions
diff --git a/test/filters/seccomp-debug-32.exp b/test/filters/seccomp-debug-32.exp
index 6983758c3..098b309f5 100755
--- a/test/filters/seccomp-debug-32.exp
+++ b/test/filters/seccomp-debug-32.exp
@@ -43,7 +43,7 @@ expect {
43} 43}
44expect { 44expect {
45 timeout {puts "TESTING ERROR 7\n";exit} 45 timeout {puts "TESTING ERROR 7\n";exit}
46 "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" 46 "Installing /run/firejail/mnt/seccomp.64 seccomp filter"
47} 47}
48expect { 48expect {
49 timeout {puts "TESTING ERROR 9\n";exit} 49 timeout {puts "TESTING ERROR 9\n";exit}
@@ -56,13 +56,13 @@ send -- "firejail --debug --ignore=seccomp sleep 1; echo done\r"
56expect { 56expect {
57 timeout {puts "TESTING ERROR 10\n";exit} 57 timeout {puts "TESTING ERROR 10\n";exit}
58 "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} 58 "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit}
59 "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 12\n";exit} 59 "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 12\n";exit}
60 "Child process initialized" 60 "Child process initialized"
61} 61}
62expect { 62expect {
63 timeout {puts "TESTING ERROR 13\n";exit} 63 timeout {puts "TESTING ERROR 13\n";exit}
64 "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit} 64 "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit}
65 "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 15\n";exit} 65 "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 15\n";exit}
66 "done" 66 "done"
67} 67}
68after 100 68after 100
@@ -82,7 +82,7 @@ expect {
82expect { 82expect {
83 timeout {puts "TESTING ERROR 21\n";exit} 83 timeout {puts "TESTING ERROR 21\n";exit}
84 "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit} 84 "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit}
85 "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" 85 "Installing /run/firejail/mnt/seccomp.64 seccomp filter"
86} 86}
87expect { 87expect {
88 timeout {puts "TESTING ERROR 23\n";exit} 88 timeout {puts "TESTING ERROR 23\n";exit}
@@ -110,12 +110,12 @@ expect {
110send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r" 110send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r"
111expect { 111expect {
112 timeout {puts "TESTING ERROR 27\n";exit} 112 timeout {puts "TESTING ERROR 27\n";exit}
113 "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 28\n";exit} 113 "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 28\n";exit}
114 "Child process initialized" 114 "Child process initialized"
115} 115}
116expect { 116expect {
117 timeout {puts "TESTING ERROR 29\n";exit} 117 timeout {puts "TESTING ERROR 29\n";exit}
118 "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 30\n";exit} 118 "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 30\n";exit}
119 "Installing /run/firejail/mnt/seccomp seccomp filter" 119 "Installing /run/firejail/mnt/seccomp seccomp filter"
120} 120}
121expect { 121expect {
@@ -128,12 +128,12 @@ after 100
128send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r" 128send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r"
129expect { 129expect {
130 timeout {puts "TESTING ERROR 33\n";exit} 130 timeout {puts "TESTING ERROR 33\n";exit}
131 "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 34\n";exit} 131 "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 34\n";exit}
132 "Child process initialized" 132 "Child process initialized"
133} 133}
134expect { 134expect {
135 timeout {puts "TESTING ERROR 35\n";exit} 135 timeout {puts "TESTING ERROR 35\n";exit}
136 "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 35\n";exit} 136 "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 35\n";exit}
137 "Installing /run/firejail/mnt/seccomp seccomp filter" 137 "Installing /run/firejail/mnt/seccomp seccomp filter"
138} 138}
139expect { 139expect {
diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp
index 7a4a13991..4986a6bf6 100755
--- a/test/filters/seccomp-debug.exp
+++ b/test/filters/seccomp-debug.exp
@@ -31,7 +31,7 @@ expect {
31after 100 31after 100
32 32
33 33
34# amd64 architecture 34# 64 bit architecture
35send -- "firejail --debug sleep 1; echo done\r" 35send -- "firejail --debug sleep 1; echo done\r"
36expect { 36expect {
37 timeout {puts "TESTING ERROR 5\n";exit} 37 timeout {puts "TESTING ERROR 5\n";exit}
@@ -43,7 +43,7 @@ expect {
43} 43}
44expect { 44expect {
45 timeout {puts "TESTING ERROR 7\n";exit} 45 timeout {puts "TESTING ERROR 7\n";exit}
46 "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" 46 "Installing /run/firejail/mnt/seccomp.32 seccomp filter"
47} 47}
48expect { 48expect {
49 timeout {puts "TESTING ERROR 8\n";exit} 49 timeout {puts "TESTING ERROR 8\n";exit}
@@ -55,18 +55,18 @@ expect {
55} 55}
56after 100 56after 100
57 57
58# amd64 architecture - ignore seccomp 58# 64 bit architecture - ignore seccomp
59send -- "firejail --debug --ignore=seccomp sleep 1; echo done\r" 59send -- "firejail --debug --ignore=seccomp sleep 1; echo done\r"
60expect { 60expect {
61 timeout {puts "TESTING ERROR 10\n";exit} 61 timeout {puts "TESTING ERROR 10\n";exit}
62 "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} 62 "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit}
63 "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 12\n";exit} 63 "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit}
64 "Child process initialized" 64 "Child process initialized"
65} 65}
66expect { 66expect {
67 timeout {puts "TESTING ERROR 13\n";exit} 67 timeout {puts "TESTING ERROR 13\n";exit}
68 "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit} 68 "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit}
69 "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 15\n";exit} 69 "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 15\n";exit}
70 "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" 70 "Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
71} 71}
72expect { 72expect {
@@ -75,7 +75,7 @@ expect {
75} 75}
76after 100 76after 100
77 77
78# amd64 architecture - ignore protocol 78# 64 bit architecture - ignore protocol
79send -- "firejail --debug --ignore=protocol sleep 1; echo done\r" 79send -- "firejail --debug --ignore=protocol sleep 1; echo done\r"
80expect { 80expect {
81 timeout {puts "TESTING ERROR 17\n";exit} 81 timeout {puts "TESTING ERROR 17\n";exit}
@@ -90,7 +90,7 @@ expect {
90expect { 90expect {
91 timeout {puts "TESTING ERROR 21\n";exit} 91 timeout {puts "TESTING ERROR 21\n";exit}
92 "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit} 92 "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit}
93 "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" 93 "Installing /run/firejail/mnt/seccomp.32 seccomp filter"
94} 94}
95expect { 95expect {
96 timeout {puts "TESTING ERROR 23\n";exit} 96 timeout {puts "TESTING ERROR 23\n";exit}
@@ -114,21 +114,21 @@ expect {
114} 114}
115 115
116 116
117# amd64 architecture - seccomp.block-secondary 117# 64 bit architecture - seccomp.block-secondary
118send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r" 118send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r"
119expect { 119expect {
120 timeout {puts "TESTING ERROR 27\n";exit} 120 timeout {puts "TESTING ERROR 27\n";exit}
121 "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 28\n";exit} 121 "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit}
122 "Child process initialized" 122 "Child process initialized"
123} 123}
124expect { 124expect {
125 timeout {puts "TESTING ERROR 29\n";exit} 125 timeout {puts "TESTING ERROR 29\n";exit}
126 "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 30\n";exit} 126 "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 30\n";exit}
127 "Installing /run/firejail/mnt/seccomp seccomp filter" 127 "Installing /run/firejail/mnt/seccomp seccomp filter"
128} 128}
129expect { 129expect {
130 timeout {puts "TESTING ERROR 31\n";exit} 130 timeout {puts "TESTING ERROR 31\n";exit}
131 "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 32\n";exit} 131 "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 32\n";exit}
132 "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" 132 "Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
133} 133}
134expect { 134expect {
@@ -137,16 +137,16 @@ expect {
137} 137}
138after 100 138after 100
139 139
140# amd64 architecture - seccomp.block-secondary, profile 140# 64 bit architecture - seccomp.block-secondary, profile
141send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r" 141send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r"
142expect { 142expect {
143 timeout {puts "TESTING ERROR 33\n";exit} 143 timeout {puts "TESTING ERROR 33\n";exit}
144 "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 34\n";exit} 144 "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit}
145 "Child process initialized" 145 "Child process initialized"
146} 146}
147expect { 147expect {
148 timeout {puts "TESTING ERROR 35\n";exit} 148 timeout {puts "TESTING ERROR 35\n";exit}
149 "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 35\n";exit} 149 "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit}
150 "Installing /run/firejail/mnt/seccomp seccomp filter" 150 "Installing /run/firejail/mnt/seccomp seccomp filter"
151} 151}
152expect { 152expect {
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-03 12:08:43 +0000