4 files changed, 80 insertions, 10 deletions

diff --git a/test/profiles/comment.profile b/test/profiles/comment.profile
new file mode 100644
index 000000000..4a907a408
--- /dev/null
+++ b/test/profiles/comment.profile
@@ -0,0 +1,3 @@
+# this is a comment
+net none # this is another comment
+private # some other comment
diff --git a/test/profiles/profile_comment.exp b/test/profiles/profile_comment.exp
new file mode 100755
index 000000000..a2be510c1
--- /dev/null
+++ b/test/profiles/profile_comment.exp
@@ -0,0 +1,52 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2021 Firejail Authors
+# License GPL v2
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "rm -fr /tmp/firejailtest*\r"
+send -- "rm -fr /tmp/firejail-strace*\r"
+send -- "rm -fr /tmp/firejail-trace*\r"
+sleep 1
+
+send -- "firejail --profile=comment.profile /usr/bin/true\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "Parent is shutting down"
+}
+sleep 2
+
+send -- "firejail --build=/tmp/firejailtest.profile /usr/bin/true\r"
+sleep 1
+
+send -- "cat /tmp/firejailtest.profile\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "seccomp"
+}
+after 100
+
+send -- "firejail --profile=/tmp/firejailtest.profile /usr/bin/true\r"
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "Child process initialized"
+}
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "Parent is shutting down"
+}
+after 100
+
+send -- "rm -fr /tmp/firejailtest*\r"
+send -- "rm -fr /tmp/firejail-strace*\r"
+send -- "rm -fr /tmp/firejail-trace*\r"
+after 100
+
+puts "\nall done\n"
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh
index a5f74f2e2..cbc6fa4d9 100755
--- a/test/profiles/profiles.sh
+++ b/test/profiles/profiles.sh
@@ -7,6 +7,9 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
 
+echo "TESTING: profile comments (test/profiles/profilecomment.exp)"
+./profile_comment.exp
+
 echo "TESTING: profile conditional (test/profiles/conditional.exp)"
 ./conditional.exp
 
diff --git a/test/utils/build.exp b/test/utils/build.exp
index cdc2f3b7b..7fbe969a4 100755
--- a/test/utils/build.exp
+++ b/test/utils/build.exp
@@ -21,35 +21,35 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        "blacklist /usr/share"
+        "include whitelist-usr-share-common.inc"
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "blacklist /var"
+        "include whitelist-var-common.inc"
 }
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "private-bin cat,"
+        "caps.drop all"
 }
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "private-dev"
+        "ipc-namespace"
 }
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
-        "private-etc"
+        "netfilter"
 }
 expect {
         timeout {puts "TESTING ERROR 7\n";exit}
-        "private-tmp"
+        "nonewprivs"
 }
 expect {
         timeout {puts "TESTING ERROR 8\n";exit}
-        "caps.drop all"
+        "noroot"
 }
 expect {
         timeout {puts "TESTING ERROR 9\n";exit}
-        "nonewprivs"
+        "net none"
 }
 expect {
         timeout {puts "TESTING ERROR 10\n";exit}
@@ -57,11 +57,23 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 11\n";exit}
-        "net none"
+        "shell none"
+}
+expect {
+        timeout {puts "TESTING ERROR 11\n";exit}
+        "private-bin cat,"
 }
 expect {
         timeout {puts "TESTING ERROR 12\n";exit}
-        "shell none"
+        "private-dev"
+}
+expect {
+        timeout {puts "TESTING ERROR 13\n";exit}
+        "private-etc none"
+}
+expect {
+        timeout {puts "TESTING ERROR 14\n";exit}
+        "private-tmp"
 }
 after 100