diff options
author | 2016-06-17 07:53:51 -0400 | |
---|---|---|
committer | 2016-06-17 07:53:51 -0400 | |
commit | 70c21962d584ada8f58d9743d1a603d5a5a6a698 (patch) | |
tree | 62f7e48fd7b165f47d4d802444f0e2b22eaec065 | |
parent | pulseaudio fix (diff) | |
parent | Xephyr typo (diff) | |
download | firejail-70c21962d584ada8f58d9743d1a603d5a5a6a698.tar.gz firejail-70c21962d584ada8f58d9743d1a603d5a5a6a698.tar.zst firejail-70c21962d584ada8f58d9743d1a603d5a5a6a698.zip |
Merge pull request #575 from reinerh/master
skip ip6 test if filter table not available
-rwxr-xr-x | test/apps-x11/apps-x11.sh | 6 | ||||
-rwxr-xr-x | test/network/ip6.exp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh index a8556ab8f..1b3494290 100755 --- a/test/apps-x11/apps-x11.sh +++ b/test/apps-x11/apps-x11.sh | |||
@@ -13,12 +13,12 @@ then | |||
13 | echo "xpra found" | 13 | echo "xpra found" |
14 | else | 14 | else |
15 | echo "xpra not found" | 15 | echo "xpra not found" |
16 | which xephyr | 16 | which Xephyr |
17 | if [ "$?" -eq 0 ]; | 17 | if [ "$?" -eq 0 ]; |
18 | then | 18 | then |
19 | echo "xephyr found" | 19 | echo "Xephyr found" |
20 | else | 20 | else |
21 | echo "TESTING SKIP: xpra and/or xephyr not found" | 21 | echo "TESTING SKIP: xpra and/or Xephyr not found" |
22 | exit | 22 | exit |
23 | fi | 23 | fi |
24 | fi | 24 | fi |
diff --git a/test/network/ip6.exp b/test/network/ip6.exp index 2cd756a1d..e5939021e 100755 --- a/test/network/ip6.exp +++ b/test/network/ip6.exp | |||
@@ -18,6 +18,7 @@ expect { | |||
18 | } | 18 | } |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 2\n";exit} | 20 | timeout {puts "TESTING ERROR 2\n";exit} |
21 | "unable to initialize table 'filter'" {puts "\nTESTING SKIP 2: no IPv6 support\n"; exit} | ||
21 | "2001:db8:1f0a:3ec::2" | 22 | "2001:db8:1f0a:3ec::2" |
22 | } | 23 | } |
23 | expect { | 24 | expect { |