Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit61dd815

Browse files
committed
Fix MSVC recipe for ecpg regression tests.
While back-patching commit6f0cef9, I forgot that the MSVCbuild scripts would also need adjustment in the back branches.This is a blind attempt at a fix, but it's basically copyingnearby code so I think it will work.Per buildfarm (via Andrew Dunstan)Discussion:https://postgr.es/m/4cc4dc47-ca2b-4129-8784-db69b5f82777@dunslane.net
1 parent2b6a74a commit61dd815

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

‎src/tools/msvc/ecpg_regression.proj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PgcInclude="$(TESTDIR)\**\*.pgc"Exclude="$(TESTDIR)\performance\perftest.pgc"/>
18+
<PgcInclude="$(TESTDIR)\**\*.pgc"Exclude="$(TESTDIR)\performance\perftest.pgc;$(TESTDIR)\sql\define_prelim.pgc"/>
1919
</ItemGroup>
2020

2121
<ItemGroup>
@@ -51,9 +51,12 @@
5151
<CreatePropertyValue="-i"Condition="'%(Pgc.FileName)'=='strings'">
5252
<OutputTaskParameter="Value"PropertyName="ECPGPARAM" />
5353
</CreateProperty>
54+
<CreatePropertyValue="define_prelim.pgc"Condition="'%(Pgc.FileName)'=='define'">
55+
<OutputTaskParameter="Value"PropertyName="ECPGEXTRA" />
56+
</CreateProperty>
5457

5558
<!-- Run ECPG and the Visual C++ compiler on the files. Don't bother with dependency check between the steps-->
56-
<ExecWorkingDirectory="%(Pgc.RelativeDir)"Command="$(OUTDIR)ecpg\ecpg -I ../../include --regression $(ECPGPARAM) -o %(Pgc.Filename).c %(Pgc.Filename).pgc" />
59+
<ExecWorkingDirectory="%(Pgc.RelativeDir)"Command="$(OUTDIR)ecpg\ecpg -I ../../include --regression $(ECPGPARAM) -o %(Pgc.Filename).c$(ECPGEXTRA)%(Pgc.Filename).pgc" />
5760
<ExecWorkingDirectorY="%(Pgc.RelativeDir)"Command="cl /nologo %(Pgc.FileName).c /TC /MD$(DEBUGLIB) /DENABLE_THREAD_SAFETY /DWIN32 /I. /I..\..\include /I..\..\..\libpq /I..\..\..\..\include /link /defaultlib:$(OUTDIR)libecpg\libecpg.lib /defaultlib:$(OUTDIR)libecpg_compat\libecpg_compat.lib /defaultlib:$(OUTDIR)libpgtypes\libpgtypes.lib" />
5861
</Target>
5962

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp