changeset 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 62a1667f60f8
files lib/Test/Nginx.pm
diffstat 1 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lib/Test/Nginx.pm
+++ b/lib/Test/Nginx.pm
@@ -350,7 +350,10 @@ sub run(;$) {
 		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 @@ sub dump_config() {
 	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 @@ sub reload() {
 		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 @@ sub stop() {
 		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 {