Mercurial > hg > nginx-tests
diff lib/Test/Nginx.pm @ 1630:6f573329e862
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 |
line wrap: on
line diff
--- a/lib/Test/Nginx.pm Mon Nov 30 20:53:11 2020 +0300 +++ b/lib/Test/Nginx.pm Mon Nov 30 20:53:12 2020 +0300 @@ -350,7 +350,10 @@ my @globals = $self->{_test_globals} ? () : ('-g', "pid $testdir/nginx.pid; " . "error_log $testdir/error.log debug;"); - exec($NGINX, '-p', "$testdir/", '-c', 'nginx.conf', @globals), + my @error = $self->has_version('1.19.5') ? + ('-e', 'error.log') : (); + exec($NGINX, '-p', "$testdir/", '-c', 'nginx.conf', + @error, @globals) or die "Unable to exec(): $!\n"; } @@ -422,8 +425,10 @@ my @globals = $self->{_test_globals} ? () : ('-g', "pid $testdir/nginx.pid; " . "error_log $testdir/error.log debug;"); + my @error = $self->has_version('1.19.5') ? + ('-e', 'error.log') : (); my $command = "$NGINX -T -p $testdir/ -c nginx.conf " - . join(' ', @globals); + . join(' ', @error, @globals); return qx/$command 2>&1/; } @@ -476,8 +481,10 @@ my @globals = $self->{_test_globals} ? () : ('-g', "pid $testdir/nginx.pid; " . "error_log $testdir/error.log debug;"); + my @error = $self->has_version('1.19.5') ? + ('-e', 'error.log') : (); system($NGINX, '-p', $testdir, '-c', "nginx.conf", - '-s', 'reload', @globals) == 0 + '-s', 'reload', @error, @globals) == 0 or die "system() failed: $?\n"; } else { @@ -499,8 +506,10 @@ my @globals = $self->{_test_globals} ? () : ('-g', "pid $testdir/nginx.pid; " . "error_log $testdir/error.log debug;"); + my @error = $self->has_version('1.19.5') ? + ('-e', 'error.log') : (); system($NGINX, '-p', $testdir, '-c', "nginx.conf", - '-s', 'stop', @globals) == 0 + '-s', 'stop', @error, @globals) == 0 or die "system() failed: $?\n"; } else {