diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 18afcfaa8..bb0b5a375 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -120,6 +120,21 @@ + + + + + + + + + + + +

Update test.pl --psql-bin option to match command-line help.

+
+
+
@@ -12115,6 +12130,11 @@ jungle-boogie + + Koshi Shibagaki + k-zshiba + + Höseyin Sönmez huseynsnmz diff --git a/test/lib/pgBackRestTest/Common/JobTest.pm b/test/lib/pgBackRestTest/Common/JobTest.pm index c89a17b2f..bb89cc374 100644 --- a/test/lib/pgBackRestTest/Common/JobTest.pm +++ b/test/lib/pgBackRestTest/Common/JobTest.pm @@ -290,7 +290,7 @@ sub run ($self->{strLogLevel} ne lc(INFO) ? " --log-level=$self->{strLogLevel}" : '') . ($self->{strLogLevelTestFile} ne lc(TRACE) ? " --log-level-test-file=$self->{strLogLevelTestFile}" : '') . ($self->{bLogTimestamp} ? '' : ' --no-log-timestamp') . - ' --pgsql-bin=' . $self->{oTest}->{&TEST_PGSQL_BIN} . + ' --psql-bin=' . $self->{oTest}->{&TEST_PGSQL_BIN} . ($self->{strTimeZone} ? " --tz='$self->{strTimeZone}'" : '') . ($self->{bDryRun} ? ' --dry-run' : '') . ($self->{bDryRun} ? ' --vm-out' : '') . diff --git a/test/lib/pgBackRestTest/Common/ListTest.pm b/test/lib/pgBackRestTest/Common/ListTest.pm index 8e3e98723..41f402156 100644 --- a/test/lib/pgBackRestTest/Common/ListTest.pm +++ b/test/lib/pgBackRestTest/Common/ListTest.pm @@ -34,7 +34,7 @@ use constant TEST_NAME => 'test'; push @EXPORT, qw(TEST_NAME); use constant TEST_BIN_REQ => 'bin-req'; push @EXPORT, qw(TEST_BIN_REQ); -use constant TEST_PGSQL_BIN => 'pgsql-bin'; +use constant TEST_PGSQL_BIN => 'psql-bin'; push @EXPORT, qw(TEST_PGSQL_BIN); use constant TEST_INTEGRATION => 'integration'; push @EXPORT, qw(TEST_INTEGRATION); diff --git a/test/lib/pgBackRestTest/Common/VmTest.pm b/test/lib/pgBackRestTest/Common/VmTest.pm index d52edb68f..a886e47ce 100644 --- a/test/lib/pgBackRestTest/Common/VmTest.pm +++ b/test/lib/pgBackRestTest/Common/VmTest.pm @@ -40,7 +40,7 @@ use constant VM_IMAGE => 'image'; push @EXPORT, qw(VM_IMAGE); use constant VM_OS_BASE => 'os-base'; push @EXPORT, qw(VM_OS_BASE); -use constant VMDEF_PGSQL_BIN => 'pgsql-bin'; +use constant VMDEF_PGSQL_BIN => 'psql-bin'; push @EXPORT, qw(VMDEF_PGSQL_BIN); use constant VMDEF_LCOV_VERSION => 'lcov-version'; push @EXPORT, qw(VMDEF_LCOV_VERSION); diff --git a/test/test.pl b/test/test.pl index 17b3d9944..fc5cc13ab 100755 --- a/test/test.pl +++ b/test/test.pl @@ -175,7 +175,7 @@ GetOptions ('q|quiet' => \$bQuiet, 'help' => \$bHelp, 'clean' => \$bClean, 'clean-only' => \$bCleanOnly, - 'pgsql-bin=s' => \$strPgSqlBin, + 'psql-bin=s' => \$strPgSqlBin, 'test-path=s' => \$strTestPath, 'make-cmd=s' => \$strMakeCmd, 'log-level=s' => \$strLogLevel,