1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-15 01:04:37 +02:00

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

The option to specify the path to psql was shown in the command-line help as --psql-bin but the option was actually named --pgsql-bin.

Rename to match the help so they are consistent.
This commit is contained in:
k_zshiba
2022-11-14 13:47:27 +09:00
committed by GitHub
parent 58b3c91bab
commit 3ad588443b
5 changed files with 24 additions and 4 deletions

View File

@ -120,6 +120,21 @@
</release-item> </release-item>
</release-development-list> </release-development-list>
</release-core-list> </release-core-list>
<release-test-list>
<release-improvement-list>
<release-item>
<github-pull-request id="1920"/>
<release-item-contributor-list>
<release-item-contributor id="koshi.shibagaki"/>
<release-item-reviewer id="david.steele"/>
</release-item-contributor-list>
<p>Update <file>test.pl</file> <setting>--psql-bin</setting> option to match command-line help.</p>
</release-item>
</release-improvement-list>
</release-test-list>
</release> </release>
<release date="2022-09-19" version="2.41" title="Backup Annotations"> <release date="2022-09-19" version="2.41" title="Backup Annotations">
@ -12115,6 +12130,11 @@
<contributor-id type="github">jungle-boogie</contributor-id> <contributor-id type="github">jungle-boogie</contributor-id>
</contributor> </contributor>
<contributor id="koshi.shibagaki">
<contributor-name-display>Koshi Shibagaki</contributor-name-display>
<contributor-id type="github">k-zshiba</contributor-id>
</contributor>
<contributor id="huseyin.sonmez"> <contributor id="huseyin.sonmez">
<contributor-name-display>H&amp;ouml;seyin S&amp;ouml;nmez</contributor-name-display> <contributor-name-display>H&amp;ouml;seyin S&amp;ouml;nmez</contributor-name-display>
<contributor-id type="github">huseynsnmz</contributor-id> <contributor-id type="github">huseynsnmz</contributor-id>

View File

@ -290,7 +290,7 @@ sub run
($self->{strLogLevel} ne lc(INFO) ? " --log-level=$self->{strLogLevel}" : '') . ($self->{strLogLevel} ne lc(INFO) ? " --log-level=$self->{strLogLevel}" : '') .
($self->{strLogLevelTestFile} ne lc(TRACE) ? " --log-level-test-file=$self->{strLogLevelTestFile}" : '') . ($self->{strLogLevelTestFile} ne lc(TRACE) ? " --log-level-test-file=$self->{strLogLevelTestFile}" : '') .
($self->{bLogTimestamp} ? '' : ' --no-log-timestamp') . ($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->{strTimeZone} ? " --tz='$self->{strTimeZone}'" : '') .
($self->{bDryRun} ? ' --dry-run' : '') . ($self->{bDryRun} ? ' --dry-run' : '') .
($self->{bDryRun} ? ' --vm-out' : '') . ($self->{bDryRun} ? ' --vm-out' : '') .

View File

@ -34,7 +34,7 @@ use constant TEST_NAME => 'test';
push @EXPORT, qw(TEST_NAME); push @EXPORT, qw(TEST_NAME);
use constant TEST_BIN_REQ => 'bin-req'; use constant TEST_BIN_REQ => 'bin-req';
push @EXPORT, qw(TEST_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); push @EXPORT, qw(TEST_PGSQL_BIN);
use constant TEST_INTEGRATION => 'integration'; use constant TEST_INTEGRATION => 'integration';
push @EXPORT, qw(TEST_INTEGRATION); push @EXPORT, qw(TEST_INTEGRATION);

View File

@ -40,7 +40,7 @@ use constant VM_IMAGE => 'image';
push @EXPORT, qw(VM_IMAGE); push @EXPORT, qw(VM_IMAGE);
use constant VM_OS_BASE => 'os-base'; use constant VM_OS_BASE => 'os-base';
push @EXPORT, qw(VM_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); push @EXPORT, qw(VMDEF_PGSQL_BIN);
use constant VMDEF_LCOV_VERSION => 'lcov-version'; use constant VMDEF_LCOV_VERSION => 'lcov-version';
push @EXPORT, qw(VMDEF_LCOV_VERSION); push @EXPORT, qw(VMDEF_LCOV_VERSION);

View File

@ -175,7 +175,7 @@ GetOptions ('q|quiet' => \$bQuiet,
'help' => \$bHelp, 'help' => \$bHelp,
'clean' => \$bClean, 'clean' => \$bClean,
'clean-only' => \$bCleanOnly, 'clean-only' => \$bCleanOnly,
'pgsql-bin=s' => \$strPgSqlBin, 'psql-bin=s' => \$strPgSqlBin,
'test-path=s' => \$strTestPath, 'test-path=s' => \$strTestPath,
'make-cmd=s' => \$strMakeCmd, 'make-cmd=s' => \$strMakeCmd,
'log-level=s' => \$strLogLevel, 'log-level=s' => \$strLogLevel,