db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-10-30 23:37:45 +02:00
Code Issues Releases Activity

Fix container test path being used when --vm=none.

Browse Source 
Suggested by Stephen Frost.
This commit is contained in:
David Steele
2019-10-10 15:09:11 -04:00
parent e732720d85
commit 13fcbb24e9
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/xml/release.xml
View File

@@ -57,6 +57,18 @@
</release-item> </release-item>
</release-improvement-list> </release-improvement-list>
</release-doc-list> </release-doc-list>
<release-test-list>
<release-improvement-list>
<release-item>
<release-item-contributor-list>
<release-item-ideator id="stephen.frost"/>
</release-item-contributor-list>
<p>Fix container test path being used when <br-option>--vm=none</br-option>.</p>
</release-item>
</release-improvement-list>
</release-test-list>
</release> </release>
<release date="2019-10-01" version="2.18" title="PostgreSQL 12 Support"> <release date="2019-10-01" version="2.18" title="PostgreSQL 12 Support">

6
test/lib/pgBackRestTest/Common/JobTest.pm
View File

@@ -380,10 +380,14 @@ sub run
# Is this test running in a container? # Is this test running in a container?
my $strContainer = $self->{oTest}->{&TEST_VM} eq VM_NONE ? 'false' : 'true'; my $strContainer = $self->{oTest}->{&TEST_VM} eq VM_NONE ? 'false' : 'true';
# What test path should be passed to C? Containers always have their test path at ~/test but when running with
# vm=none it should be in a subdirectory of the current directory.
my $strTestPathC = $self->{oTest}->{&TEST_VM} eq VM_NONE ? $strHostTestPath : $strVmTestPath;
# Set globals # Set globals
$strTestC =~ s/\{\[C\_TEST\_CONTAINER\]\}/$strContainer/g; $strTestC =~ s/\{\[C\_TEST\_CONTAINER\]\}/$strContainer/g;
$strTestC =~ s/\{\[C\_TEST\_PROJECT\_EXE\]\}/$strProjectExePath/g; $strTestC =~ s/\{\[C\_TEST\_PROJECT\_EXE\]\}/$strProjectExePath/g;
$strTestC =~ s/\{\[C\_TEST\_PATH\]\}/$strVmTestPath/g; $strTestC =~ s/\{\[C\_TEST\_PATH\]\}/$strTestPathC/g;
$strTestC =~ s/\{\[C\_TEST\_DATA_PATH\]\}/$self->{strDataPath}/g; $strTestC =~ s/\{\[C\_TEST\_DATA_PATH\]\}/$self->{strDataPath}/g;
$strTestC =~ s/\{\[C\_TEST\_REPO_PATH\]\}/$self->{strBackRestBase}/g; $strTestC =~ s/\{\[C\_TEST\_REPO_PATH\]\}/$self->{strBackRestBase}/g;
$strTestC =~ s/\{\[C\_TEST\_SCALE\]\}/$self->{iScale}/g; $strTestC =~ s/\{\[C\_TEST\_SCALE\]\}/$self->{iScale}/g;