aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2017-09-19 18:29:12 -0400
committerPeter Eisentraut <peter_e@gmx.net>2017-09-19 18:51:25 -0400
commitf41e56c76e39f02bef7ba002c9de03d62b76de4d (patch)
tree43a6a330310a7049f5d770b219fff4b8dd9a9aeb
parent71edbb6f66f7139d6209334ef8734a122ba06b56 (diff)
downloadpostgresql-f41e56c76e39f02bef7ba002c9de03d62b76de4d.tar.gz
postgresql-f41e56c76e39f02bef7ba002c9de03d62b76de4d.zip
Add basic TAP test setup for pg_upgrade
The plan is to convert the current pg_upgrade test to the TAP framework. This commit just puts a basic TAP test in place so that we can see how the build farm behaves, since the build farm client has some special knowledge of the pg_upgrade tests. Author: Michael Paquier <michael.paquier@gmail.com>
-rw-r--r--src/bin/pg_upgrade/Makefile7
-rw-r--r--src/bin/pg_upgrade/t/001_basic.pl9
2 files changed, 13 insertions, 3 deletions
diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile
index 1d6ee702c6e..e5c98596a1a 100644
--- a/src/bin/pg_upgrade/Makefile
+++ b/src/bin/pg_upgrade/Makefile
@@ -36,8 +36,9 @@ clean distclean maintainer-clean:
pg_upgrade_dump_globals.sql \
pg_upgrade_dump_*.custom pg_upgrade_*.log
-check: test.sh all
+check: test.sh
+ $(prove_check)
MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< --install
-# installcheck is not supported because there's no meaningful way to test
-# pg_upgrade against a single already-running server
+installcheck:
+ $(prove_installcheck)
diff --git a/src/bin/pg_upgrade/t/001_basic.pl b/src/bin/pg_upgrade/t/001_basic.pl
new file mode 100644
index 00000000000..605a7f622f2
--- /dev/null
+++ b/src/bin/pg_upgrade/t/001_basic.pl
@@ -0,0 +1,9 @@
+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');