aboutsummaryrefslogtreecommitdiffstats
path: root/test/utils
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-04-28 19:53:24 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-04-28 19:53:24 -0400
commitd77adb591d152269750f1a0eed33882102f81386 (patch)
treef48ea6b90087b636efea2c87b432d31253eae6b0 /test/utils
parentfixed make test-envirnment for running under /tmp (diff)
parentFixes for ls.exp and trace.exp (diff)
downloadfirejail-d77adb591d152269750f1a0eed33882102f81386.tar.gz
firejail-d77adb591d152269750f1a0eed33882102f81386.tar.zst
firejail-d77adb591d152269750f1a0eed33882102f81386.zip
Merge pull request #488 from reinerh/master
Fixes for ls.exp and trace.exp
Diffstat (limited to 'test/utils')
-rwxr-xr-xtest/utils/ls.exp2
-rwxr-xr-xtest/utils/trace.exp10
2 files changed, 6 insertions, 6 deletions
diff --git a/test/utils/ls.exp b/test/utils/ls.exp
index 1936c0aff..3a99be0d5 100755
--- a/test/utils/ls.exp
+++ b/test/utils/ls.exp
@@ -12,7 +12,7 @@ expect {
12 "Child process initialized" 12 "Child process initialized"
13} 13}
14sleep 2 14sleep 2
15send -- "echo my_testing > lstesting\r" 15send -- "echo my_testing > ~/lstesting\r"
16sleep 2 16sleep 2
17 17
18 18
diff --git a/test/utils/trace.exp b/test/utils/trace.exp
index c08925101..41058fd74 100755
--- a/test/utils/trace.exp
+++ b/test/utils/trace.exp
@@ -95,18 +95,18 @@ sleep 1
95 95
96send -- "firejail --trace\r" 96send -- "firejail --trace\r"
97expect { 97expect {
98 timeout {puts "TESTING ERROR 0\n";exit} 98 timeout {puts "TESTING ERROR 11\n";exit}
99 "Child process initialized" 99 "Child process initialized"
100} 100}
101expect { 101expect {
102 timeout {puts "TESTING ERROR 1\n";exit} 102 timeout {puts "TESTING ERROR 12\n";exit}
103 "bash:open /dev/tty" {puts "64bit\n"} 103 "bash:open /dev/tty" {puts "64bit\n"}
104 "bash:open64 /dev/tty" {puts "32bit\n"} 104 "bash:open64 /dev/tty" {puts "32bit\n"}
105} 105}
106expect { 106expect {
107 timeout {puts "TESTING ERROR 3\n";exit} 107 timeout {puts "TESTING ERROR 13\n";exit}
108 "bash:access /etc/terminfo/x/xterm" {puts "debian\n"} 108 "bash:access /etc/terminfo/" {puts "debian\n"}
109 "bash:access /usr/share/terminfo/x/xterm" {puts "arch\n"} 109 "bash:access /usr/share/terminfo/" {puts "arch\n"}
110} 110}
111 111
112puts "\nall done\n" 112puts "\nall done\n"