diff options
| author | Tom Lane | 2008-05-30 00:04:32 +0000 |
|---|---|---|
| committer | Tom Lane | 2008-05-30 00:04:32 +0000 |
| commit | bf4bd50ff76d2049ba4a96762e729394b4f8fa22 (patch) | |
| tree | 9df58a9d675a70810ab17854fe076046e2e896c8 /src/tools | |
| parent | d11e301a15e0c28f5db7caa74ad192fec4351f2f (diff) | |
Copy refint.so and autoinc.so into the src/test/regress directory during
"make all", and then reference them there during the actual tests. This
makes the handling of these files more parallel to that of regress.so,
and in particular simplifies use of the regression tests outside the
original build tree. The PGDG and Red Hat RPMs have been doing this via
patches for a very long time. Inclusion of the change in core was requested
by Jørgen Austvik of Sun, and I can't see any reason not to.
I attempted to fix the MSVC scripts for this too, but they may need
further tweaking ...
Diffstat (limited to 'src/tools')
| -rwxr-xr-x | src/tools/msvc/clean.bat | 4 | ||||
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat index 9b3b278bad9..d061f7c57f5 100755 --- a/src/tools/msvc/clean.bat +++ b/src/tools/msvc/clean.bat @@ -1,5 +1,5 @@ @echo off -REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.10 2008/02/06 15:13:25 mha Exp $ +REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.11 2008/05/30 00:04:32 tgl Exp $ set DIST=0 if "%1"=="dist" set DIST=1 @@ -65,6 +65,8 @@ if exist src\test\regress\tmp_check rd /s /q src\test\regress\tmp_check if exist contrib\spi\refint.dll del /q contrib\spi\refint.dll if exist contrib\spi\autoinc.dll del /q contrib\spi\autoinc.dll if exist src\test\regress\regress.dll del /q src\test\regress\regress.dll +if exist src\test\regress\refint.dll del /q src\test\regress\refint.dll +if exist src\test\regress\autoinc.dll del /q src\test\regress\autoinc.dll REM Clean up datafiles built with contrib REM cd contrib diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 32e2548e976..53f6c59501f 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -1,7 +1,7 @@ # -*-perl-*- hey - emacs - this is a perl file -# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.6 2007/11/13 22:49:47 tgl Exp $ +# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.7 2008/05/30 00:04:32 tgl Exp $ use strict; @@ -36,8 +36,8 @@ else # use a capital C here because config.pl has $config my $Config = -e "release/postgres/postgres.exe" ? "Release" : "Debug"; -copy("$Config/refint/refint.dll","contrib/spi"); -copy("$Config/autoinc/autoinc.dll","contrib/spi"); +copy("$Config/refint/refint.dll","src/test/regress"); +copy("$Config/autoinc/autoinc.dll","src/test/regress"); copy("$Config/regress/regress.dll","src/test/regress"); $ENV{PATH} = "../../../$Config/libpq;../../$Config/libpq;$ENV{PATH}"; |
