Mercurial > hg > nginx-tests

comparison lib/Test/Nginx.pm @ 1630:6f573329e862

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: "-e" command line option support.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 30 Nov 2020 20:53:12 +0300
parents a1874249496d
children 12f32d82936d
comparison
equal deleted inserted replaced
1629:a1874249496d 1630:6f573329e862
348 348
349 if ($pid == 0) { 349 if ($pid == 0) {
350 my @globals = $self->{_test_globals} ? 350 my @globals = $self->{_test_globals} ?
351 () : ('-g', "pid $testdir/nginx.pid; " 351 () : ('-g', "pid $testdir/nginx.pid; "
352 . "error_log $testdir/error.log debug;"); 352 . "error_log $testdir/error.log debug;");
353 exec($NGINX, '-p', "$testdir/", '-c', 'nginx.conf', @globals), 353 my @error = $self->has_version('1.19.5') ?
354 ('-e', 'error.log') : ();
355 exec($NGINX, '-p', "$testdir/", '-c', 'nginx.conf',
356 @error, @globals)
354 or die "Unable to exec(): $!\n"; 357 or die "Unable to exec(): $!\n";
355 } 358 }
356 359
357 # wait for nginx to start 360 # wait for nginx to start
358 361
420 my $testdir = $self->{_testdir}; 423 my $testdir = $self->{_testdir};
421 424
422 my @globals = $self->{_test_globals} ? 425 my @globals = $self->{_test_globals} ?
423 () : ('-g', "pid $testdir/nginx.pid; " 426 () : ('-g', "pid $testdir/nginx.pid; "
424 . "error_log $testdir/error.log debug;"); 427 . "error_log $testdir/error.log debug;");
428 my @error = $self->has_version('1.19.5') ?
429 ('-e', 'error.log') : ();
425 my $command = "$NGINX -T -p $testdir/ -c nginx.conf " 430 my $command = "$NGINX -T -p $testdir/ -c nginx.conf "
426 . join(' ', @globals); 431 . join(' ', @error, @globals);
427 432
428 return qx/$command 2>&1/; 433 return qx/$command 2>&1/;
429 } 434 }
430 435
431 sub waitforfile($;$) { 436 sub waitforfile($;$) {
474 if ($^O eq 'MSWin32') { 479 if ($^O eq 'MSWin32') {
475 my $testdir = $self->{_testdir}; 480 my $testdir = $self->{_testdir};
476 my @globals = $self->{_test_globals} ? 481 my @globals = $self->{_test_globals} ?
477 () : ('-g', "pid $testdir/nginx.pid; " 482 () : ('-g', "pid $testdir/nginx.pid; "
478 . "error_log $testdir/error.log debug;"); 483 . "error_log $testdir/error.log debug;");
484 my @error = $self->has_version('1.19.5') ?
485 ('-e', 'error.log') : ();
479 system($NGINX, '-p', $testdir, '-c', "nginx.conf", 486 system($NGINX, '-p', $testdir, '-c', "nginx.conf",
480 '-s', 'reload', @globals) == 0 487 '-s', 'reload', @error, @globals) == 0
481 or die "system() failed: $?\n"; 488 or die "system() failed: $?\n";
482 489
483 } else { 490 } else {
484 kill 'HUP', $pid; 491 kill 'HUP', $pid;
485 } 492 }
497 if ($^O eq 'MSWin32') { 504 if ($^O eq 'MSWin32') {
498 my $testdir = $self->{_testdir}; 505 my $testdir = $self->{_testdir};
499 my @globals = $self->{_test_globals} ? 506 my @globals = $self->{_test_globals} ?
500 () : ('-g', "pid $testdir/nginx.pid; " 507 () : ('-g', "pid $testdir/nginx.pid; "
501 . "error_log $testdir/error.log debug;"); 508 . "error_log $testdir/error.log debug;");
509 my @error = $self->has_version('1.19.5') ?
510 ('-e', 'error.log') : ();
502 system($NGINX, '-p', $testdir, '-c', "nginx.conf", 511 system($NGINX, '-p', $testdir, '-c', "nginx.conf",
503 '-s', 'stop', @globals) == 0 512 '-s', 'stop', @error, @globals) == 0
504 or die "system() failed: $?\n"; 513 or die "system() failed: $?\n";
505 514
506 } else { 515 } else {
507 kill 'QUIT', $pid; 516 kill 'QUIT', $pid;
508 } 517 }