Skip fpm tests not designed to be run as root

When running as root with TEST_FPM_RUN_AS_ROOT=1

diff --git a/sapi/fpm/tests/bug68391-conf-include-order.phpt b/sapi/fpm/tests/bug68391-conf-include-order.phpt
index 012a978f298e4ec9194ad02f787c7c44f44780b0..a357cf8bd33b59c0ee6a16021f3cb4794bb12652 100644 (file)
--- a/sapi/fpm/tests/bug68391-conf-include-order.phpt
+++ b/sapi/fpm/tests/bug68391-conf-include-order.phpt
@@ -3,6 +3,7 @@ FPM: bug68391 - Configuration inclusion in alphabetical order
 --SKIPIF--
 <?php
 include "skipif.inc";
+FPM\Tester::skipIfRoot();
 ?>
 --FILE--
 <?php

diff --git a/sapi/fpm/tests/proc-user-ignored.phpt b/sapi/fpm/tests/proc-user-ignored.phpt
index e1902af11bd8ceac5c8c63f012f8b1bc97cf5385..d99c4c264aa2c17cca98d95fbee543893da21244 100644 (file)
--- a/sapi/fpm/tests/proc-user-ignored.phpt
+++ b/sapi/fpm/tests/proc-user-ignored.phpt
@@ -3,6 +3,7 @@ FPM: Process user setting ignored when FPM is not running as root
 --SKIPIF--
 <?php
 include "skipif.inc";
+FPM\Tester::skipIfRoot();
 ?>
 --FILE--
 <?php

diff --git a/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt b/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt
index a4d352123cc0b331a858f257620a5ca60cc39994..885fd4d075076bf3d8301f4badaaa7bba6cccef6 100644 (file)
--- a/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt
+++ b/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt
@@ -3,6 +3,7 @@ FPM: UNIX socket owner and group settings can be numeric
 --SKIPIF--
 <?php
 include "skipif.inc";
+FPM\Tester::skipIfRoot();
 FPM\Tester::skipIfPosixNotLoaded();
 ?>
 --FILE--

diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc
index d63e8a72505850609df904c5a44b50c4a03f00da..da5719b0648b293d3eab45264d7af0463b19695b 100644 (file)
--- a/sapi/fpm/tests/tester.inc
+++ b/sapi/fpm/tests/tester.inc
@@ -278,6 +278,16 @@ class Tester
         }
     }
 
+    /**
+     * Skip if running as root.
+     */
+    static public function skipIfRoot()
+    {
+        if (getmyuid() == 0) {
+            die('skip running as root');
+        }
+    }
+
     /**
      * Skip if posix extension not loaded.
      */