aboutsummaryrefslogtreecommitdiffstats
path: root/test/sysutils
diff options
context:
space:
mode:
authorLibravatar Reiner Herrmann <reiner@reiner-h.de>2020-10-25 13:58:26 +0100
committerLibravatar Reiner Herrmann <reiner@reiner-h.de>2020-10-25 13:58:26 +0100
commit03b9d9dedd9668b30f9394e41766ba7012a853a1 (patch)
tree37550ff28c48ffd07fff444a52bddb1ddbef044d /test/sysutils
parentmerges (diff)
parentincreate timeout in xz.dec (diff)
downloadfirejail-03b9d9dedd9668b30f9394e41766ba7012a853a1.tar.gz
firejail-03b9d9dedd9668b30f9394e41766ba7012a853a1.tar.zst
firejail-03b9d9dedd9668b30f9394e41766ba7012a853a1.zip
Merge branch 'tests' into master
Diffstat (limited to 'test/sysutils')
-rwxr-xr-xtest/sysutils/less.exp1
-rwxr-xr-xtest/sysutils/xz.exp5
2 files changed, 5 insertions, 1 deletions
diff --git a/test/sysutils/less.exp b/test/sysutils/less.exp
index 2bfb60302..daa666c18 100755
--- a/test/sysutils/less.exp
+++ b/test/sysutils/less.exp
@@ -10,6 +10,7 @@ match_max 100000
10send -- "firejail less sysutils.sh\r" 10send -- "firejail less sysutils.sh\r"
11expect { 11expect {
12 timeout {puts "TESTING ERROR 1\n";exit} 12 timeout {puts "TESTING ERROR 1\n";exit}
13 "(press RETURN)" {puts "TESTING SKIP 1.1\n";exit}
13 "MALLOC_CHECK" 14 "MALLOC_CHECK"
14} 15}
15expect { 16expect {
diff --git a/test/sysutils/xz.exp b/test/sysutils/xz.exp
index 63b1ad3c7..074b90076 100755
--- a/test/sysutils/xz.exp
+++ b/test/sysutils/xz.exp
@@ -3,7 +3,7 @@
3# Copyright (C) 2014-2020 Firejail Authors 3# Copyright (C) 2014-2020 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 60
7spawn $env(SHELL) 7spawn $env(SHELL)
8match_max 100000 8match_max 100000
9 9
@@ -13,6 +13,9 @@ sleep 1
13send -- "firejail /usr/bin/xz -c /usr/bin/firejail > firejail_t2\r" 13send -- "firejail /usr/bin/xz -c /usr/bin/firejail > firejail_t2\r"
14sleep 1 14sleep 1
15 15
16send -- "md5sum firejail_t1 firejail_t2; ls -l firejail_t1 firejail_t2\r"
17sleep 1
18
16send -- "diff -s firejail_t1 firejail_t2\r" 19send -- "diff -s firejail_t1 firejail_t2\r"
17expect { 20expect {
18 timeout {puts "TESTING ERROR 1\n";exit} 21 timeout {puts "TESTING ERROR 1\n";exit}