diff options
| author | Stephen Frost <sfrost@snowman.net> | 2016-05-06 16:39:56 -0400 |
|---|---|---|
| committer | Stephen Frost <sfrost@snowman.net> | 2016-05-06 16:39:56 -0400 |
| commit | 6e243c43c9b2d35f91a73d3982db6a0cad0eb64b (patch) | |
| tree | f3018daf9ca87b2f9c8e3ca3c31a05cdb3aa24c7 /src | |
| parent | 76ef266a86fdc3c4bdbd12b9ea9cacd523e00779 (diff) | |
| download | postgresql-6e243c43c9b2d35f91a73d3982db6a0cad0eb64b.tar.gz postgresql-6e243c43c9b2d35f91a73d3982db6a0cad0eb64b.zip | |
Add test_pg_dump to @contrib_excludes
The test_pg_dump extension doesn't have a C component, so we need
to exclude it from the MSVC build system trying to figure out how
to build it.
Also add a "MODULES" line to the Makefile, as test_extensions has.
Might not be necessary, but seems good to keep things consistent.
Lastly, remove the 'installcheck' line from test_pg_dump, as that
was causing redefinition errors, at least on my box. This also
makes test_pg_dump consistent with how commit_ts is set up.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/modules/test_pg_dump/Makefile | 4 | ||||
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/test/modules/test_pg_dump/Makefile b/src/test/modules/test_pg_dump/Makefile index e6adbb82b42..08d8903e721 100644 --- a/src/test/modules/test_pg_dump/Makefile +++ b/src/test/modules/test_pg_dump/Makefile @@ -1,5 +1,6 @@ # src/test/modules/test_rls_hooks/Makefile +MODULE = test_pg_dump PGFILEDESC = "test_pg_dump - Test pg_dump with an extension" EXTENSION = test_pg_dump @@ -12,9 +13,6 @@ check: prove-check prove-check: $(prove_check) -installcheck: - $(prove_installcheck) - ifdef USE_PGXS PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 3c5092ff9a6..e7268cb2ed3 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -43,7 +43,7 @@ my $contrib_extrasource = { my @contrib_excludes = ( 'commit_ts', 'hstore_plperl', 'hstore_plpython', 'intagg', 'ltree_plpython', 'pgcrypto', 'sepgsql', 'brin', - 'test_extensions', 'snapshot_too_old'); + 'test_extensions', 'test_pg_dump', 'snapshot_too_old'); # Set of variables for frontend modules my $frontend_defines = { 'initdb' => 'FRONTEND' }; |