Mercurial > hg > nginx-tests

changeset 375:5fdde9f755c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: a couple of auxiliary environment variables introduced.
author Andrei Belov <defan@nginx.com>
date Thu, 20 Feb 2014 21:40:10 +0400
parents ac804fd1eb56
children ab2d8abea393
files lib/Test/Nginx.pm
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lib/Test/Nginx.pm
+++ b/lib/Test/Nginx.pm
@@ -348,6 +348,9 @@ sub test_globals() {
 	$s .= "pid $self->{_testdir}/nginx.pid;\n";
 	$s .= "error_log $self->{_testdir}/error.log debug;\n";
 
+	$s .= $ENV{TEST_NGINX_GLOBALS}
+		if $ENV{TEST_NGINX_GLOBALS};
+
 	$self->{_test_globals} = $s;
 }
 
@@ -375,6 +378,9 @@ sub test_globals_http() {
 	$s .= "scgi_temp_path $self->{_testdir}/scgi_temp;\n"
 		if $self->has_module('scgi');
 
+	$s .= $ENV{TEST_NGINX_GLOBALS_HTTP}
+		if $ENV{TEST_NGINX_GLOBALS_HTTP};
+
 	$self->{_test_globals_http} = $s;
 }