18 files changed, 43 insertions, 35 deletions

diff --git a/test/root/apache2.exp b/test/root/apache2.exp
index c3e520224..a6b25de2f 100755
--- a/test/root/apache2.exp
+++ b/test/root/apache2.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --name=apache /etc/init.d/apache2 start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/root/cgroup.exp b/test/root/cgroup.exp
index f64edf4b9..9a1bbe161 100755
--- a/test/root/cgroup.exp
+++ b/test/root/cgroup.exp
@@ -20,7 +20,7 @@ expect {
 send --  "firejail --name=\"join testing\" --cgroup=/sys/fs/cgroup/systemd/firejail/tasks\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
@@ -37,14 +37,18 @@ expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "Switching to pid"
 }
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
+}
 sleep 1
 send -- "ps aux\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
         "/bin/bash"
 }
 expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
+        timeout {puts "TESTING ERROR 6\n";exit}
         "/bin/bash"
 }
 
@@ -53,7 +57,7 @@ after 100
 spawn $env(SHELL)
 send -- "wc -l /sys/fs/cgroup/systemd/firejail/tasks\r"
 expect {
-        timeout {puts "TESTING ERROR 6\n";exit}
+        timeout {puts "TESTING ERROR 7\n";exit}
         "3"
 }
 after 100
diff --git a/test/root/firemon-events.exp b/test/root/firemon-events.exp
index f2c0879db..8eab93a2a 100755
--- a/test/root/firemon-events.exp
+++ b/test/root/firemon-events.exp
@@ -18,7 +18,7 @@ set firejail_id $spawn_id
 send -- "firejail\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 
 # get messages on firemon
diff --git a/test/root/isc-dhcp.exp b/test/root/isc-dhcp.exp
index 86291a9f9..20e5ef408 100755
--- a/test/root/isc-dhcp.exp
+++ b/test/root/isc-dhcp.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --name=dhcpd /etc/init.d/isc-dhcp-server start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/root/join.exp b/test/root/join.exp
index 19b4c8f02..291ee9115 100755
--- a/test/root/join.exp
+++ b/test/root/join.exp
@@ -11,7 +11,7 @@ match_max 100000
 send --  "firejail --name=jointesting --cpu=0 --nice=2\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
@@ -21,14 +21,18 @@ expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Switching to pid"
 }
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
+}
 sleep 1
 send -- "ps aux\r"
 expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
         "/bin/bash"
 }
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "/bin/bash"
 }
 
@@ -36,15 +40,15 @@ send -- "exit\r"
 sleep 1
 send --  "firejail --join-network=jointesting\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "Child process initialized"
+        timeout {puts "TESTING ERROR 5\n";exit}
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 send -- "exit\r"
 sleep 1
 send --  "firejail --join-filesystem=jointesting\r"
 expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
-        "Child process initialized"
+        timeout {puts "TESTING ERROR 6\n";exit}
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 
 after 100
diff --git a/test/root/login_nobody.exp b/test/root/login_nobody.exp
index cf3df268d..9c0932196 100755
--- a/test/root/login_nobody.exp
+++ b/test/root/login_nobody.exp
@@ -11,7 +11,7 @@ match_max 100000
 send --  "su - nobody -s /usr/bin/firejail\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
diff --git a/test/root/nginx.exp b/test/root/nginx.exp
index af1ab8eb9..40d8cb51e 100755
--- a/test/root/nginx.exp
+++ b/test/root/nginx.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --name=nginx /etc/init.d/nginx start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/root/option_bind_directory.exp b/test/root/option_bind_directory.exp
index 122a1ea79..4fabf0cd8 100755
--- a/test/root/option_bind_directory.exp
+++ b/test/root/option_bind_directory.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --bind=/tmp/chroot,mntpoint\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/root/option_bind_file.exp b/test/root/option_bind_file.exp
index 4e02638e6..6c796a2b0 100755
--- a/test/root/option_bind_file.exp
+++ b/test/root/option_bind_file.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --bind=tmpfile,/etc/passwd\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/root/option_tmpfs.exp b/test/root/option_tmpfs.exp
index b40335680..13820afe8 100755
--- a/test/root/option_tmpfs.exp
+++ b/test/root/option_tmpfs.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --tmpfs=/var\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/root/private.exp b/test/root/private.exp
index edc2520a2..70d0218fa 100755
--- a/test/root/private.exp
+++ b/test/root/private.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --private\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
@@ -42,7 +42,7 @@ after 100
 send -- "firejail --private-opt=firejail-test-file,firejail-test-dir --debug\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -57,7 +57,7 @@ sleep 1
 send -- "firejail --whitelist=/opt/firejail-test-file --whitelist=/opt/firejail-test-dir --debug\r"
 expect {
         timeout {puts "TESTING ERROR 3.1\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -80,7 +80,7 @@ after 100
 send -- "firejail --private-srv=firejail-test-file,firejail-test-dir --debug\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -95,7 +95,7 @@ sleep 1
 send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r"
 expect {
         timeout {puts "TESTING ERROR 5.1\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/root/profile_tmpfs.exp b/test/root/profile_tmpfs.exp
index 8625f100a..fba63773f 100755
--- a/test/root/profile_tmpfs.exp
+++ b/test/root/profile_tmpfs.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --profile=tmpfs.profile\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/root/seccomp-chmod.exp b/test/root/seccomp-chmod.exp
index 8fbb687d5..ef0453548 100755
--- a/test/root/seccomp-chmod.exp
+++ b/test/root/seccomp-chmod.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --seccomp=chmod,fchmod,fchmodat --private\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/root/seccomp-chown.exp b/test/root/seccomp-chown.exp
index 0d9262494..968a4bc96 100755
--- a/test/root/seccomp-chown.exp
+++ b/test/root/seccomp-chown.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --seccomp=chown,fchown,fchownat,lchown --private\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/root/seccomp-umount.exp b/test/root/seccomp-umount.exp
index 51a7c7647..b99ec30f7 100755
--- a/test/root/seccomp-umount.exp
+++ b/test/root/seccomp-umount.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --seccomp --noprofile\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/root/snmpd.exp b/test/root/snmpd.exp
index 7658cfc68..510abfbad 100755
--- a/test/root/snmpd.exp
+++ b/test/root/snmpd.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --name=snmpd /etc/init.d/snmpd start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/root/unbound.exp b/test/root/unbound.exp
index 9e000be5e..6440304b2 100755
--- a/test/root/unbound.exp
+++ b/test/root/unbound.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --name=unbound unbound\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/root/whitelist.exp b/test/root/whitelist.exp
index 1e29e3fef..2397f6a90 100755
--- a/test/root/whitelist.exp
+++ b/test/root/whitelist.exp
@@ -16,7 +16,7 @@ after 100
 send -- "firejail --whitelist=/mnt/firejail-test-file --whitelist=/mnt/firejail-test-dir --debug\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -39,7 +39,7 @@ after 100
 send -- "firejail --whitelist=/opt/firejail-test-file  --whitelist=/opt/firejail-test-dir --debug\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -61,7 +61,7 @@ after 100
 send -- "firejail --whitelist=/media/firejail-test-file --whitelist=/media/firejail-test-dir --debug\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -78,7 +78,7 @@ sleep 1
 send -- "firejail --whitelist=/var/run --whitelist=/var/lock --debug\r"
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -100,7 +100,7 @@ after 100
 send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r"
 expect {
         timeout {puts "TESTING ERROR 8\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1