diff options
-rw-r--r-- | etc/bitlbee.profile | 2 | ||||
-rwxr-xr-x | test/arguments/arguments.sh | 2 | ||||
-rwxr-xr-x | test/arguments/symrun.exp | 2 | ||||
-rwxr-xr-x | test/arguments/symrun.sh | 3 | ||||
-rwxr-xr-x | test/environment/doubledash.exp | 8 | ||||
-rwxr-xr-x | test/network/bandwidth.exp | 2 |
6 files changed, 12 insertions, 7 deletions
diff --git a/etc/bitlbee.profile b/etc/bitlbee.profile index 4666d2fe7..87d2e843a 100644 --- a/etc/bitlbee.profile +++ b/etc/bitlbee.profile | |||
@@ -11,4 +11,4 @@ private-dev | |||
11 | protocol unix,inet,inet6 | 11 | protocol unix,inet,inet6 |
12 | seccomp | 12 | seccomp |
13 | nosound | 13 | nosound |
14 | 14 | read-write /var/lib/bitlbee | |
diff --git a/test/arguments/arguments.sh b/test/arguments/arguments.sh index a9b3f9587..2f53eb3fa 100755 --- a/test/arguments/arguments.sh +++ b/test/arguments/arguments.sh | |||
@@ -1,5 +1,7 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | 2 | ||
3 | [ -f argtest ] || make argtest | ||
4 | |||
3 | echo "TESTING: 1. regular bash session" | 5 | echo "TESTING: 1. regular bash session" |
4 | ./bashrun.exp | 6 | ./bashrun.exp |
5 | 7 | ||
diff --git a/test/arguments/symrun.exp b/test/arguments/symrun.exp index 1466b791e..10e7ac6c8 100755 --- a/test/arguments/symrun.exp +++ b/test/arguments/symrun.exp | |||
@@ -4,7 +4,7 @@ set timeout 10 | |||
4 | spawn $env(SHELL) | 4 | spawn $env(SHELL) |
5 | match_max 100000 | 5 | match_max 100000 |
6 | 6 | ||
7 | send -- "./bashrun.sh\r" | 7 | send -- "./symrun.sh\r" |
8 | expect { | 8 | expect { |
9 | timeout {puts "TESTING ERROR 2.1.1\n";exit} | 9 | timeout {puts "TESTING ERROR 2.1.1\n";exit} |
10 | "Arguments:" | 10 | "Arguments:" |
diff --git a/test/arguments/symrun.sh b/test/arguments/symrun.sh index b46803ae2..d28f024a8 100755 --- a/test/arguments/symrun.sh +++ b/test/arguments/symrun.sh | |||
@@ -3,6 +3,9 @@ | |||
3 | mkdir symtest | 3 | mkdir symtest |
4 | ln -s /usr/bin/firejail symtest/argtest | 4 | ln -s /usr/bin/firejail symtest/argtest |
5 | 5 | ||
6 | # search for argtest in current directory | ||
7 | export PATH=$PATH:. | ||
8 | |||
6 | echo "TESTING: 2.1 - simple args" | 9 | echo "TESTING: 2.1 - simple args" |
7 | symtest/argtest arg1 arg2 | 10 | symtest/argtest arg1 arg2 |
8 | 11 | ||
diff --git a/test/environment/doubledash.exp b/test/environment/doubledash.exp index 668468980..7abf4b918 100755 --- a/test/environment/doubledash.exp +++ b/test/environment/doubledash.exp | |||
@@ -36,23 +36,23 @@ expect { | |||
36 | sleep 3 | 36 | sleep 3 |
37 | 37 | ||
38 | spawn $env(SHELL) | 38 | spawn $env(SHELL) |
39 | send -- "firejail --list;pwd\r" | 39 | send -- "firejail --list;ls -d /tmp\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 6\n";exit} | 41 | timeout {puts "TESTING ERROR 6\n";exit} |
42 | "name=testing" | 42 | "name=testing" |
43 | } | 43 | } |
44 | expect { | 44 | expect { |
45 | timeout {puts "TESTING ERROR 7\n";exit} | 45 | timeout {puts "TESTING ERROR 7\n";exit} |
46 | "home" | 46 | "/tmp" |
47 | } | 47 | } |
48 | send -- "firejail --list;pwd\r" | 48 | send -- "firejail --list;ls -d /tmp\r" |
49 | expect { | 49 | expect { |
50 | timeout {puts "TESTING ERROR 8 (join)\n";exit} | 50 | timeout {puts "TESTING ERROR 8 (join)\n";exit} |
51 | "join=testing" | 51 | "join=testing" |
52 | } | 52 | } |
53 | expect { | 53 | expect { |
54 | timeout {puts "TESTING ERROR 9\n";exit} | 54 | timeout {puts "TESTING ERROR 9\n";exit} |
55 | "home" | 55 | "/tmp" |
56 | } | 56 | } |
57 | 57 | ||
58 | sleep 1 | 58 | sleep 1 |
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp index bccb0b9f3..2913c6b14 100755 --- a/test/network/bandwidth.exp +++ b/test/network/bandwidth.exp | |||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --bandwidth=test status\r" | 18 | send -- "firejail --bandwidth=test status\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\n";exit} |
21 | "qdisc pfifo_fast 0: dev eth0" | 21 | "qdisc * 0: dev eth0" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||