aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Reiner Herrmann <reiner@reiner-h.de>2020-08-14 11:12:49 +0200
committerLibravatar Reiner Herrmann <reiner@reiner-h.de>2020-08-14 11:14:05 +0200
commit018a2f589a4b76a7fc31100461fc13aa4ab64d1d (patch)
treed96c1b15b1a0f96710108e427c230bd331b330ec
parentprint errno if char device creation fails (diff)
downloadfirejail-018a2f589a4b76a7fc31100461fc13aa4ab64d1d.tar.gz
firejail-018a2f589a4b76a7fc31100461fc13aa4ab64d1d.tar.zst
firejail-018a2f589a4b76a7fc31100461fc13aa4ab64d1d.zip
tests: fix rlimit test for 32bit archs
On 32bit architectures like armhf, the output was "unlimited" instead of the expected value. (cherry picked from commit 45480f36de7a5d0965912039d406534e2b80d4a0)
-rwxr-xr-xtest/environment/rlimit-profile.exp2
-rwxr-xr-xtest/environment/rlimit.exp4
-rw-r--r--test/environment/rlimit.profile2
3 files changed, 4 insertions, 4 deletions
diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp
index 43d6a3ee0..33eb0b3fd 100755
--- a/test/environment/rlimit-profile.exp
+++ b/test/environment/rlimit-profile.exp
@@ -27,7 +27,7 @@ expect {
27} 27}
28expect { 28expect {
29 timeout {puts "TESTING ERROR 1.4\n";exit} 29 timeout {puts "TESTING ERROR 1.4\n";exit}
30 "Max address space 123456789012 123456789012" 30 "Max address space 1234567890 1234567890"
31} 31}
32expect { 32expect {
33 timeout {puts "TESTING ERROR 1.5\n";exit} 33 timeout {puts "TESTING ERROR 1.5\n";exit}
diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp
index 38cdc3eea..c0ba895fe 100755
--- a/test/environment/rlimit.exp
+++ b/test/environment/rlimit.exp
@@ -5,7 +5,7 @@ cd /home
5spawn $env(SHELL) 5spawn $env(SHELL)
6match_max 100000 6match_max 100000
7 7
8send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=123456789012\r" 8send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=1234567890\r"
9expect { 9expect {
10 timeout {puts "TESTING ERROR 0\n";exit} 10 timeout {puts "TESTING ERROR 0\n";exit}
11 "Child process initialized" 11 "Child process initialized"
@@ -27,7 +27,7 @@ expect {
27} 27}
28expect { 28expect {
29 timeout {puts "TESTING ERROR 1.4\n";exit} 29 timeout {puts "TESTING ERROR 1.4\n";exit}
30 "Max address space 123456789012 123456789012" 30 "Max address space 1234567890 1234567890"
31} 31}
32expect { 32expect {
33 timeout {puts "TESTING ERROR 1.5\n";exit} 33 timeout {puts "TESTING ERROR 1.5\n";exit}
diff --git a/test/environment/rlimit.profile b/test/environment/rlimit.profile
index a569edc6d..2f1134e6c 100644
--- a/test/environment/rlimit.profile
+++ b/test/environment/rlimit.profile
@@ -2,4 +2,4 @@ rlimit-fsize 1024
2rlimit-nproc 1000 2rlimit-nproc 1000
3rlimit-nofile 500 3rlimit-nofile 500
4rlimit-sigpending 200 4rlimit-sigpending 200
5rlimit-as 123456789012 5rlimit-as 1234567890