svn commit: r1800090 - in /httpd/test/framework/trunk/t: modules/proxy_fcgi.t php-fpm/etc/php-fpm.d/www.conf

[ji...@apache.org]

Author: jim
Date: Tue Jun 27 21:23:53 2017
New Revision: 1800090

URL: http://svn.apache.org/viewvc?rev=1800090&view=rev
Log:
Since we can specify the PID file directly, do it.

Modified:
    httpd/test/framework/trunk/t/modules/proxy_fcgi.t
    httpd/test/framework/trunk/t/php-fpm/etc/php-fpm.d/www.conf

Modified: httpd/test/framework/trunk/t/modules/proxy_fcgi.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy_fcgi.t?rev=1800090&r1=1800089&r2=1800090&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy_fcgi.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy_fcgi.t Tue Jun 27 21:23:53 2017
@@ -204,11 +204,10 @@ ok t_cmp($envs->{'SCRIPT_NAME'}, '/modul
 
 # Testing using php-fpm directly
 if ($have_php_fpm) {
-    Misc::do_do_run_run("php-fpm", sub { system "php-fpm -F -p $servroot/php-fpm"; });
+    my $pid_file = "/tmp/php-fpm-" . $$ . "-" . time . ".pid";
+    Misc::do_do_run_run("php-fpm", sub { system "php-fpm -F -g $pid_file -p $servroot/php-fpm"; });
     sleep 1; # Yes, we really need this here since php-fpm takes a while
     $envs = run_fcgi_envvar_request(-1, "/fpm/sub1/sub2/test.php?query");
-    # NOTE: Magic location!! See www.conf in t/php-fpm/etc/php-fpm.d
-    # TODO: Make this less magical
-    kill 'TERM', `cat /tmp/httpd-test-php-fpm.pid`;
+    kill 'TERM', `cat $pid_file`;
     ok t_cmp($envs->{'SCRIPT_NAME'}, '/fpm/sub1/sub2/test.php', "Server sets correct SCRIPT_NAME by default");
 }

Modified: httpd/test/framework/trunk/t/php-fpm/etc/php-fpm.d/www.conf
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/php-fpm/etc/php-fpm.d/www.conf?rev=1800090&r1=1800089&r2=1800090&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/php-fpm/etc/php-fpm.d/www.conf (original)
+++ httpd/test/framework/trunk/t/php-fpm/etc/php-fpm.d/www.conf Tue Jun 27 21:23:53 2017
@@ -1,7 +1,6 @@
 ; Start a new pool named 'www'.
 ; the variable $pool can be used in any directive and will be replaced by the
 ; pool name ('www' here)
-pid = /tmp/httpd-test-php-fpm.pid
 [www]
 listen = 127.0.0.1:9001
 pm = static