Merge pull request #575 from reinerh/master

skip ip6 test if filter table not available

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
         echo "xpra found"
 else
         echo "xpra not found"
-        which xephyr
+        which Xephyr
         if [ "$?" -eq 0 ];
         then
-                echo "xephyr found"
+                echo "Xephyr found"
         else
-                echo "TESTING SKIP: xpra and/or xephyr not found"
+                echo "TESTING SKIP: xpra and/or Xephyr not found"
                 exit
         fi
 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 {
 }
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
+        "unable to initialize table 'filter'" {puts "\nTESTING SKIP 2: no IPv6 support\n"; exit}
         "2001:db8:1f0a:3ec::2"
 }
 expect {