From f8ad9c20bbbc5018927598c23532e33851b74d60 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Thu, 5 May 2016 18:16:03 -0400 Subject: test fixes --- test/filters/seccomp-dualfilter.exp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'test/filters/seccomp-dualfilter.exp') diff --git a/test/filters/seccomp-dualfilter.exp b/test/filters/seccomp-dualfilter.exp index 7efc117da..c75063672 100755 --- a/test/filters/seccomp-dualfilter.exp +++ b/test/filters/seccomp-dualfilter.exp @@ -3,10 +3,23 @@ # Copyright (C) 2014-2016 Firejail Authors # License GPL v2 -set timeout 10 +set timeout 1 spawn $env(SHELL) match_max 100000 +send -- "./syscall_test\r" +expect { + timeout {puts "TESTING SKIP: 64-bit support missing\n";exit} + "Usage" +} + +send -- "./syscall_test32\r" +expect { + timeout {puts "TESTING SKIP: 32-bit support missing\n";exit} + "Usage" +} + +set timeout 10 send -- "firejail ./syscall_test mount\r" expect { timeout {puts "TESTING ERROR 0\n";exit} @@ -18,7 +31,7 @@ expect { } expect { timeout {puts "TESTING ERROR 2\n";exit} - "after mount" {puts "TESTING ERROR 2.1\n";exit} + "after mount" {puts "TESTING ERROR 3\n";exit} "Parent is shutting down" } sleep 1 @@ -26,8 +39,6 @@ sleep 1 send -- "firejail ./syscall_test32 mount\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "No such file or directory" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit} - "Parent is shutting down, bye" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit} "Child process initialized" } expect { @@ -36,7 +47,7 @@ expect { } expect { timeout {puts "TESTING ERROR 6\n";exit} - "after mount" {puts "TESTING ERROR 6.1\n";exit} + "after mount" {puts "TESTING ERROR 7\n";exit} "Parent is shutting down" } -- cgit v1.2.3-70-g09d2