hidepid part 5

5 files changed, 10 insertions, 6 deletions

diff --git a/test/utils/caps.exp b/test/utils/firemon-caps.exp
index ab1067921..76aa13725 100755
--- a/test/utils/caps.exp
+++ b/test/utils/firemon-caps.exp
@@ -66,6 +66,7 @@ spawn $env(SHELL)
 send -- "firemon --caps\r"
 expect {
         timeout {puts "TESTING ERROR 8.1\n";exit}
+        "need to be root" {puts "TESTING SKIP: /proc mounted as hidepid\n"; exit}
         "bingo1"
 }
 expect {
diff --git a/test/utils/firemon-cgroup.exp b/test/utils/firemon-cgroup.exp
index 3cd4f5a03..b1ab083ae 100755
--- a/test/utils/firemon-cgroup.exp
+++ b/test/utils/firemon-cgroup.exp
@@ -27,6 +27,7 @@ send --  "firemon --cgroup\r"
 sleep 4
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
+        "need to be root" {puts "TESTING SKIP: /proc mounted as hidepid\n"; exit}
         "name=test1"
 }
 expect {
diff --git a/test/utils/firemon-cpu.exp b/test/utils/firemon-cpu.exp
index 22e44512c..f2ecd4a5c 100755
--- a/test/utils/firemon-cpu.exp
+++ b/test/utils/firemon-cpu.exp
@@ -27,6 +27,7 @@ send --  "firemon --cpu\r"
 sleep 4
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
+        "need to be root" {puts "TESTING SKIP: /proc mounted as hidepid\n"; exit}
         "name=test1"
 }
 expect {
diff --git a/test/utils/seccomp.exp b/test/utils/firemon-seccomp.exp
index c9726ff21..26c478344 100755
--- a/test/utils/seccomp.exp
+++ b/test/utils/firemon-seccomp.exp
@@ -29,6 +29,7 @@ spawn $env(SHELL)
 send -- "firemon --seccomp\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
+        "need to be root" {puts "TESTING SKIP: /proc mounted as hidepid\n"; exit}
         "bingo1"
 }
 expect {
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index 557f2c961..7b0ab1096 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -82,18 +82,18 @@ rm -f index.html*
 ./trace.exp
 rm -f index.html*
 
-echo "TESTING: firemon --seccomp (test/utils/seccomp.exp)"
-./seccomp.exp
-
-echo "TESTING: firemon --caps (test/utils/caps.exp)"
-./caps.exp
-
 echo "TESTING: top (test/utils/top.exp)"
 ./top.exp
 
 echo "TESTING: file transfer (test/utils/ls.exp)"
 ./ls.exp
 
+echo "TESTING: firemon --seccomp (test/utils/firemon-seccomp.exp)"
+./firemon-seccomp.exp
+
+echo "TESTING: firemon --caps (test/utils/firemon-caps.exp)"
+./firemon-caps.exp
+
 echo "TESTING: firemon cpu (test/utils/firemon-cpu.exp)"
 ./firemon-cpu.exp