]> granicus.if.org Git - postgresql/commitdiff
Revert "Add basic TAP test setup for pg_upgrade"
authorPeter Eisentraut <peter_e@gmx.net>
Fri, 22 Sep 2017 20:34:46 +0000 (16:34 -0400)
committerPeter Eisentraut <peter_e@gmx.net>
Fri, 22 Sep 2017 20:46:56 +0000 (16:46 -0400)
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.

src/bin/pg_upgrade/Makefile
src/bin/pg_upgrade/t/001_basic.pl [deleted file]

index e5c98596a1abc00299bb672feadf615ed696ed28..1d6ee702c6e8c2940d2e19a25a8637d3bdc4e93a 100644 (file)
@@ -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 (file)
index 605a7f6..0000000
+++ /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');