From df74a70b886bb998ac37195b4d3067c41a012738 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 24 Jan 2018 16:22:00 +0900 Subject: [PATCH 2/3] 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. --- src/bin/pg_upgrade/Makefile | 7 ++++--- src/bin/pg_upgrade/t/001_basic.pl | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 src/bin/pg_upgrade/t/001_basic.pl diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile index 1d6ee702c6..e5c98596a1 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 0000000000..605a7f622f --- /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'); -- 2.15.1