From 30a15fe9d0907da202914b87111c700235319296 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Wed, 6 Dec 2017 18:06:46 -0500
Subject: testing

---
 src/man/firejail.txt      |  3 +++
 test/fnetfilter/copy.exp  |  4 ++--
 test/fnetfilter/test1.net |  4 ++--
 test/utils/cpu-print.exp  | 16 ++++++++++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 927c5e309..1a769176c 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -416,7 +416,10 @@ Use this option if you don't trust the DNS setup on your network.
 Example:
 .br
 $ firejail \-\-dns=8.8.8.8 \-\-dns=8.8.4.4 firefox
+.br
 
+.br
+Note: this feature is not supported on systemd-resolved setups.
 .TP
 \fB\-\-dns.print=name|pid
 Print DNS configuration for a sandbox identified by name or by PID.
diff --git a/test/fnetfilter/copy.exp b/test/fnetfilter/copy.exp
index 65145ec4b..f619d503a 100755
--- a/test/fnetfilter/copy.exp
+++ b/test/fnetfilter/copy.exp
@@ -16,11 +16,11 @@ after 100
 send -- "cat outfile\r"
 expect {
 	timeout {puts "TESTING ERROR 1\n";exit}
-	"test1"
+	"*filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 2\n";exit}
-	"*filter"
+	"test1"
 }
 expect {
 	timeout {puts "TESTING ERROR 3\n";exit}
diff --git a/test/fnetfilter/test1.net b/test/fnetfilter/test1.net
index 59bef1443..e60127373 100644
--- a/test/fnetfilter/test1.net
+++ b/test/fnetfilter/test1.net
@@ -1,5 +1,5 @@
 *filter
-# test2
+# test1
 :INPUT DROP [0:0]
 :FORWARD DROP [0:0]
 :OUTPUT ACCEPT [0:0]
@@ -9,7 +9,7 @@
 #-A INPUT -p icmp --icmp-type echo-reply -j ACCEPT
 -A INPUT -p icmp --icmp-type destination-unreachable -j ACCEPT
 -A INPUT -p icmp --icmp-type time-exceeded -j ACCEPT
--A INPUT -p icmp --icmp-type echo-request -j ACCEPT 
+-A INPUT -p icmp --icmp-type echo-request -j ACCEPT
 # disable STUN
 -A OUTPUT -p udp --dport 3478 -j DROP
 -A OUTPUT -p udp --dport 3479 -j DROP
diff --git a/test/utils/cpu-print.exp b/test/utils/cpu-print.exp
index f639f7c9f..714745106 100755
--- a/test/utils/cpu-print.exp
+++ b/test/utils/cpu-print.exp
@@ -16,7 +16,11 @@ sleep 1
 send -- "cat /proc/self/status | grep Cpus\r"
 expect {
 	timeout {puts "TESTING ERROR 1\n";exit}
-	"Cpus_allowed_list:	0"
+	"Cpus"
+}
+expect {
+	timeout {puts "TESTING ERROR 2\n";exit}
+	"_allowed_list:	0"
 }
 after 100
 send -- "exit\r"
@@ -25,7 +29,7 @@ sleep 1
 
 send -- "firejail --name=test --cpu=1\r"
 expect {
-	timeout {puts "TESTING ERROR 1\n";exit}
+	timeout {puts "TESTING ERROR 3\n";exit}
 	"Child process initialized"
 }
 sleep 1
@@ -33,8 +37,12 @@ sleep 1
 spawn $env(SHELL)
 send -- "firejail --cpu.print=test\r"
 expect {
-	timeout {puts "TESTING ERROR 2\n";exit}
-	"Cpus_allowed_list:	1"
+	timeout {puts "TESTING ERROR 4\n";exit}
+	"Cpus"
+}
+expect {
+	timeout {puts "TESTING ERROR 5\n";exit}
+	"_allowed_list:	1"
 }
 after 100
 puts "\nall done\n"
-- 
cgit v1.2.3-54-g00ecf