From cb5d361a7b52844bb18346f1829b69b4b7084439 Mon Sep 17 00:00:00 2001 From: Topi Miettinen Date: Sat, 2 Sep 2017 14:05:31 +0300 Subject: Improve seccomp support for non-x86 architectures --- test/filters/seccomp-debug-32.exp | 16 ++++++++-------- test/filters/seccomp-debug.exp | 28 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'test/filters') 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 { } expect { timeout {puts "TESTING ERROR 7\n";exit} - "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" + "Installing /run/firejail/mnt/seccomp.64 seccomp filter" } expect { timeout {puts "TESTING ERROR 9\n";exit} @@ -56,13 +56,13 @@ send -- "firejail --debug --ignore=seccomp sleep 1; echo done\r" expect { timeout {puts "TESTING ERROR 10\n";exit} "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} - "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 12\n";exit} + "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 12\n";exit} "Child process initialized" } expect { timeout {puts "TESTING ERROR 13\n";exit} "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit} - "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 15\n";exit} + "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 15\n";exit} "done" } after 100 @@ -82,7 +82,7 @@ expect { expect { timeout {puts "TESTING ERROR 21\n";exit} "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit} - "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" + "Installing /run/firejail/mnt/seccomp.64 seccomp filter" } expect { timeout {puts "TESTING ERROR 23\n";exit} @@ -110,12 +110,12 @@ expect { send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r" expect { timeout {puts "TESTING ERROR 27\n";exit} - "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 28\n";exit} + "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 28\n";exit} "Child process initialized" } expect { timeout {puts "TESTING ERROR 29\n";exit} - "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 30\n";exit} + "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 30\n";exit} "Installing /run/firejail/mnt/seccomp seccomp filter" } expect { @@ -128,12 +128,12 @@ after 100 send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r" expect { timeout {puts "TESTING ERROR 33\n";exit} - "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 34\n";exit} + "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 34\n";exit} "Child process initialized" } expect { timeout {puts "TESTING ERROR 35\n";exit} - "Installing /run/firejail/mnt/seccomp.amd64 seccomp filter" {puts "TESTING ERROR 35\n";exit} + "Installing /run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 35\n";exit} "Installing /run/firejail/mnt/seccomp seccomp filter" } expect { 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 { after 100 -# amd64 architecture +# 64 bit architecture send -- "firejail --debug sleep 1; echo done\r" expect { timeout {puts "TESTING ERROR 5\n";exit} @@ -43,7 +43,7 @@ expect { } expect { timeout {puts "TESTING ERROR 7\n";exit} - "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" + "Installing /run/firejail/mnt/seccomp.32 seccomp filter" } expect { timeout {puts "TESTING ERROR 8\n";exit} @@ -55,18 +55,18 @@ expect { } after 100 -# amd64 architecture - ignore seccomp +# 64 bit architecture - ignore seccomp send -- "firejail --debug --ignore=seccomp sleep 1; echo done\r" expect { timeout {puts "TESTING ERROR 10\n";exit} "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} - "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 12\n";exit} + "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit} "Child process initialized" } expect { timeout {puts "TESTING ERROR 13\n";exit} "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit} - "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 15\n";exit} + "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 15\n";exit} "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" } expect { @@ -75,7 +75,7 @@ expect { } after 100 -# amd64 architecture - ignore protocol +# 64 bit architecture - ignore protocol send -- "firejail --debug --ignore=protocol sleep 1; echo done\r" expect { timeout {puts "TESTING ERROR 17\n";exit} @@ -90,7 +90,7 @@ expect { expect { timeout {puts "TESTING ERROR 21\n";exit} "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit} - "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" + "Installing /run/firejail/mnt/seccomp.32 seccomp filter" } expect { timeout {puts "TESTING ERROR 23\n";exit} @@ -114,21 +114,21 @@ expect { } -# amd64 architecture - seccomp.block-secondary +# 64 bit architecture - seccomp.block-secondary send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r" expect { timeout {puts "TESTING ERROR 27\n";exit} - "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 28\n";exit} + "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit} "Child process initialized" } expect { timeout {puts "TESTING ERROR 29\n";exit} - "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 30\n";exit} + "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 30\n";exit} "Installing /run/firejail/mnt/seccomp seccomp filter" } expect { timeout {puts "TESTING ERROR 31\n";exit} - "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 32\n";exit} + "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 32\n";exit} "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" } expect { @@ -137,16 +137,16 @@ expect { } after 100 -# amd64 architecture - seccomp.block-secondary, profile +# 64 bit architecture - seccomp.block-secondary, profile send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r" expect { timeout {puts "TESTING ERROR 33\n";exit} - "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 34\n";exit} + "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit} "Child process initialized" } expect { timeout {puts "TESTING ERROR 35\n";exit} - "Installing /run/firejail/mnt/seccomp.i386 seccomp filter" {puts "TESTING ERROR 35\n";exit} + "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit} "Installing /run/firejail/mnt/seccomp seccomp filter" } expect { -- cgit v1.2.3-54-g00ecf