Mercurial > hg > nginx-tests

comparison lib/Test/Nginx.pm @ 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 08bb2b3785a2
children c28ecaef065f
comparison
equal deleted inserted replaced
374:ac804fd1eb56 375:5fdde9f755c9
346 my $s = ''; 346 my $s = '';
347 347
348 $s .= "pid $self->{_testdir}/nginx.pid;\n"; 348 $s .= "pid $self->{_testdir}/nginx.pid;\n";
349 $s .= "error_log $self->{_testdir}/error.log debug;\n"; 349 $s .= "error_log $self->{_testdir}/error.log debug;\n";
350 350
351 $s .= $ENV{TEST_NGINX_GLOBALS}
352 if $ENV{TEST_NGINX_GLOBALS};
353
351 $self->{_test_globals} = $s; 354 $self->{_test_globals} = $s;
352 } 355 }
353 356
354 sub test_globals_http() { 357 sub test_globals_http() {
355 my ($self) = @_; 358 my ($self) = @_;
372 $s .= "uwsgi_temp_path $self->{_testdir}/uwsgi_temp;\n" 375 $s .= "uwsgi_temp_path $self->{_testdir}/uwsgi_temp;\n"
373 if $self->has_module('uwsgi'); 376 if $self->has_module('uwsgi');
374 377
375 $s .= "scgi_temp_path $self->{_testdir}/scgi_temp;\n" 378 $s .= "scgi_temp_path $self->{_testdir}/scgi_temp;\n"
376 if $self->has_module('scgi'); 379 if $self->has_module('scgi');
380
381 $s .= $ENV{TEST_NGINX_GLOBALS_HTTP}
382 if $ENV{TEST_NGINX_GLOBALS_HTTP};
377 383
378 $self->{_test_globals_http} = $s; 384 $self->{_test_globals_http} = $s;
379 } 385 }
380 386
381 ############################################################################### 387 ###############################################################################