diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-09-22 16:34:46 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-09-22 16:46:56 -0400 |
| commit | 58ffe141eb37c3f027acd25c1fc6b36513bf9380 (patch) | |
| tree | b440e6f5f2360c3709eb85d8a9ed007055eb263e /src | |
| parent | 791961f59b792fbd4f0a992d3ccab47298e79103 (diff) | |
| download | postgresql-58ffe141eb37c3f027acd25c1fc6b36513bf9380.tar.gz postgresql-58ffe141eb37c3f027acd25c1fc6b36513bf9380.zip | |
Revert "Add basic TAP test setup for pg_upgrade"
This reverts commit f41e56c76e39f02bef7ba002c9de03d62b76de4d.
The build farm client would run the pg_upgrade tests twice, once as part
of the existing pg_upgrade check run and once as part of picking up all
TAP tests by looking for "t" directories. Since the pg_upgrade tests
are pretty slow, we will need a better solution or possibly a build farm
client change before we can proceed with this.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_upgrade/Makefile | 7 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/t/001_basic.pl | 9 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile index e5c98596a1a..1d6ee702c6e 100644 --- a/src/bin/pg_upgrade/Makefile +++ b/src/bin/pg_upgrade/Makefile @@ -36,9 +36,8 @@ clean distclean maintainer-clean: pg_upgrade_dump_globals.sql \ pg_upgrade_dump_*.custom pg_upgrade_*.log -check: test.sh - $(prove_check) +check: test.sh all MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< --install -installcheck: - $(prove_installcheck) +# installcheck is not supported because there's no meaningful way to test +# pg_upgrade against a single already-running server diff --git a/src/bin/pg_upgrade/t/001_basic.pl b/src/bin/pg_upgrade/t/001_basic.pl deleted file mode 100644 index 605a7f622f2..00000000000 --- a/src/bin/pg_upgrade/t/001_basic.pl +++ /dev/null @@ -1,9 +0,0 @@ -use strict; -use warnings; - -use TestLib; -use Test::More tests => 8; - -program_help_ok('pg_upgrade'); -program_version_ok('pg_upgrade'); -program_options_handling_ok('pg_upgrade'); |