Wrap regression test as tap

Author: kelvich

Makefile

@@ -29,7 +29,11 @@ EXTRA_INSTALL=contrib/mmts
 
 all: multimaster.so
 
-check: | temp-install regress
+submake-regress:
+	$(MAKE) -C $(top_builddir)/src/test/regress all
+	$(MAKE) -C $(top_builddir)/src/test/regress tablespace-setup
+
+check: temp-install submake-regress
 	$(prove_check)
 
 start: temp-install
@@ -43,37 +47,12 @@ start: temp-install
 stop:
 	cd $(srcdir) && TESTDIR='$(CURDIR)' \
 		$(with_temp_install) \
-		PGPORT='6$(DEF_PGPORT)' \
-		PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
 		perl run.pl --stop
 
-submake-regress:
-	$(MAKE) -C $(top_builddir)/src/test/regress all
-	$(MAKE) -C $(top_builddir)/src/test/regress tablespace-setup
-
-run-regress: submake-regress
-	$(with_temp_install) \
-	PGPORT='6$(DEF_PGPORT)' \
-	PGHOST='127.0.0.1' \
-	$(top_builddir)/src/test/regress/pg_regress \
-	--use-existing \
-	--bindir= \
-	$(pg_regress_locale_flags) multimaster || export ERROR=1; \
-	\
-	cd $(srcdir) && TESTDIR='$(CURDIR)' \
-		$(with_temp_install) \
-		PGPORT='6$(DEF_PGPORT)' \
-		PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
-		perl run.pl --stop; \
-	\
-	[ -z $${ERROR} ]
-
-regress: | start run-regress
-
 run-pg-regress: submake-regress
 	cd $(CURDIR)/$(top_builddir)/src/test/regress && \
 	$(with_temp_install) \
-	PGPORT='6$(DEF_PGPORT)' \
+	PGPORT='65432' \
 	PGHOST='127.0.0.1' \
 	PGUSER='$(USER)' \
 	./pg_regress \

run.pl

@@ -10,7 +10,6 @@
 if ($action eq "--start")
 {
 	$PostgresNode::last_port_assigned = 65431;
-	$PostgresNode::test_pghost = "127.0.0.1";
 
 	my $cluster = new Cluster($n_nodes);
 	$cluster->init();
@@ -33,6 +32,3 @@
 {
 	die("Usage: run.pl --start/--stop\n");
 }
-
-
-

t/000_regress.pl

@@ -0,0 +1,16 @@
+use Cluster;
+# use TestLib;
+use Test::More tests => 1;
+
+my $cluster = new Cluster(3);
+$cluster->init();
+$cluster->start();
+$cluster->create_mm('regression');
+
+my $port = $cluster->{nodes}->[0]->port;
+
+TestLib::system_or_bail($ENV{'PG_REGRESS'},
+    '--host=127.0.0.1', "--port=$port",
+    '--use-existing', '--bindir=', 'multimaster');
+
+is(1,1, "ok");

t/005_add_stop_node.pl

@@ -5,8 +5,6 @@
 use TestLib;
 use Test::More tests => 6;
 
-$PostgresNode::last_port_assigned = 65431;
-
 my $cluster = new Cluster(3);
 $cluster->init();
 $cluster->start();