diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2024-04-18 20:47:37 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2024-04-18 20:47:37 -0400 |
| commit | 0018f0af5a51f9af5d7d3f1c17a38620f9ec8a18 (patch) | |
| tree | 219c48bb291e4ede82e986eda2cd181f5b55fa14 | |
| parent | 392e6e9e6adab1af013b16158dc3aec0dc3739d0 (diff) | |
| download | postgresql-0018f0af5a51f9af5d7d3f1c17a38620f9ec8a18.tar.gz postgresql-0018f0af5a51f9af5d7d3f1c17a38620f9ec8a18.zip | |
Fix MSVC recipe for ecpg regression tests.
While back-patching commit 6f0cef935, I forgot that the MSVC
build scripts would also need adjustment in the back branches.
This is a blind attempt at a fix, but it's basically copying
nearby code so I think it will work.
Per buildfarm (via Andrew Dunstan)
Discussion: https://postgr.es/m/4cc4dc47-ca2b-4129-8784-db69b5f82777@dunslane.net
| -rw-r--r-- | src/tools/msvc/ecpg_regression.proj | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/msvc/ecpg_regression.proj b/src/tools/msvc/ecpg_regression.proj index ec2760b1f6d..702a3b3a0e9 100644 --- a/src/tools/msvc/ecpg_regression.proj +++ b/src/tools/msvc/ecpg_regression.proj @@ -15,7 +15,7 @@ </PropertyGroup> <ItemGroup> - <Pgc Include="$(TESTDIR)\**\*.pgc" Exclude="$(TESTDIR)\performance\perftest.pgc"/> + <Pgc Include="$(TESTDIR)\**\*.pgc" Exclude="$(TESTDIR)\performance\perftest.pgc;$(TESTDIR)\sql\define_prelim.pgc"/> </ItemGroup> <ItemGroup> @@ -51,9 +51,12 @@ <CreateProperty Value="-i" Condition="'%(Pgc.FileName)'=='strings'"> <Output TaskParameter="Value" PropertyName="ECPGPARAM" /> </CreateProperty> + <CreateProperty Value="define_prelim.pgc" Condition="'%(Pgc.FileName)'=='define'"> + <Output TaskParameter="Value" PropertyName="ECPGEXTRA" /> + </CreateProperty> <!-- Run ECPG and the Visual C++ compiler on the files. Don't bother with dependency check between the steps --> - <Exec WorkingDirectory="%(Pgc.RelativeDir)" Command="$(OUTDIR)ecpg\ecpg -I ../../include --regression $(ECPGPARAM) -o %(Pgc.Filename).c %(Pgc.Filename).pgc" /> + <Exec WorkingDirectory="%(Pgc.RelativeDir)" Command="$(OUTDIR)ecpg\ecpg -I ../../include --regression $(ECPGPARAM) -o %(Pgc.Filename).c $(ECPGEXTRA) %(Pgc.Filename).pgc" /> <Exec WorkingDirectory="%(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" /> </Target> |