multidb refactor: run/stop/regress to Makefile

Author: kelvich

Cluster.pm

@@ -63,6 +63,12 @@ sub new
 	{
 		my $host = "127.0.0.1";
 		my ($pgport, $arbiter_port) = allocate_ports($host, 2);
+
+		if(defined $ENV{MMPORT}) {
+			$pgport = $ENV{MMPORT};
+			delete $ENV{MMPORT};
+		}
+
 		my $node = new PostgresNode("node$i", $host, $pgport);
 		$node->{id} = $i;
 		$node->{arbiter_port} = $arbiter_port;

Makefile

@@ -1,4 +1,3 @@
-
 EXTENSION = multimaster
 DATA = multimaster--1.0.sql
 OBJS = src/multimaster.o src/dmq.o src/commit.o src/bytebuf.o src/bgwpool.o \
@@ -27,14 +26,43 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
+
 .PHONY: all
 
 EXTRA_INSTALL=contrib/mmts
 
 all: multimaster.so
 
-
-
 check: temp-install
 	$(prove_check)
 
+submake-regress:
+	$(MAKE) -C $(top_builddir)/src/test/regress all
+
+run: temp-install
+	rm -rf '$(CURDIR)'/tmp_check
+	$(MKDIR_P) '$(CURDIR)'/tmp_check
+	cd $(srcdir) && TESTDIR='$(CURDIR)' \
+		$(with_temp_install) \
+		MMPORT='6$(DEF_PGPORT)' \
+		PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
+		perl run.pl --start
+
+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
+
+regress: submake-regress
+	cd $(CURDIR)/$(top_builddir)/src/test/regress && \
+	$(with_temp_install) \
+	PGPORT='6$(DEF_PGPORT)' \
+	PGHOST='127.0.0.1' \
+	PGUSER='$(USER)' \
+	./pg_regress \
+	--bindir='' \
+	--use-existing \
+	--schedule=serial_schedule \
+	--dbname=postgres

run.pl

@@ -0,0 +1,34 @@
+#!/usr/bin/env perl
+
+use File::Basename;
+BEGIN { unshift @INC, '.'; unshift @INC, '../../src/test/perl' }
+use Cluster;
+
+my $n_nodes = 3;
+my $action = $ARGV[0];
+
+if ($action eq "--start")
+{
+	my $cluster = new Cluster($n_nodes);
+	$cluster->init();
+	$cluster->configure();
+	$cluster->start();
+	$cluster->await_nodes( (0..$n_nodes-1) );
+}
+elsif ($action eq "--stop")
+{
+	for my $i (1..$n_nodes)
+	{
+		TestLib::system_or_bail('pg_ctl',
+			'-D', "$TestLib::tmp_check/t_run_node${i}_data/pgdata",
+			'-m', 'fast',
+			'stop');
+	}
+}
+else
+{
+	die("Usage: run.pl --start/--stop\n");
+}
+
+
+