From 1697a640ca031ae1858ba853147cfd4b0d973f21 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 18 Dec 2017 14:28:08 +0200 Subject: [PATCH] Also remove references to enable_segwalrep in Makefiles. I removed the autoconf flag and #ifdefs earlier, but missed these. --- GNUmakefile.in | 7 +++---- gpAux/gpdemo/Makefile | 5 ----- src/Makefile.global.in | 1 - src/backend/access/transam/test/Makefile | 2 -- src/backend/cdb/test/Makefile | 2 -- src/backend/fts/Makefile | 2 -- src/backend/fts/test/Makefile | 2 -- src/backend/replication/test/Makefile | 2 -- src/backend/utils/misc/test/Makefile | 2 -- src/test/isolation2/Makefile | 2 -- src/test/regress/GNUmakefile | 2 -- src/test/walrep/Makefile | 2 -- 12 files changed, 3 insertions(+), 28 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index e51f2753ef..4b6b8002a6 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -159,12 +159,11 @@ installcheck-world: $(MAKE) -C src/test/kerberos installcheck $(MAKE) -C gpMgmt/bin installcheck gpcheckcat -A -ifeq ($(enable_segwalrep), yes) # Verify the filesystem objects are consistent between primary and mirror $(MAKE) -C contrib/gp_replica_check installcheck -else - $(MAKE) -C contrib/pg_upgrade check -endif + + # WALREP_FIXME: pg_upgrade doesn't work yet? + #$(MAKE) -C contrib/pg_upgrade check installcheck-resgroup: $(MAKE) -C src/test/isolation2 $@ diff --git a/gpAux/gpdemo/Makefile b/gpAux/gpdemo/Makefile index 9465b4ad0d..a36b5e612e 100644 --- a/gpAux/gpdemo/Makefile +++ b/gpAux/gpdemo/Makefile @@ -38,7 +38,6 @@ all: $(MAKE) probe cluster create-demo-cluster: -ifeq ($(enable_segwalrep), yes) @WITH_MIRRORS=false ./demo_cluster.sh # will generate gpdemo-env.sh ifeq ($(WITH_MIRRORS), true) @. ./gpdemo-env.sh; \ @@ -46,10 +45,6 @@ ifeq ($(WITH_MIRRORS), true) ./gpsegwalrep.py start; endif @echo "" -else - @./demo_cluster.sh - @echo "" -endif probe: @./probe_config.sh diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 6c9a1829d8..1d5ec1fb2b 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -196,7 +196,6 @@ enable_mapreduce = @enable_mapreduce@ enable_gpcloud = @enable_gpcloud@ enable_gpperfmon = @enable_gpperfmon@ -enable_segwalrep = @enable_segwalrep@ enable_tap_tests = @enable_tap_tests@ python_includespec = @python_includespec@ diff --git a/src/backend/access/transam/test/Makefile b/src/backend/access/transam/test/Makefile index fdde11fb32..1fbbf63d81 100644 --- a/src/backend/access/transam/test/Makefile +++ b/src/backend/access/transam/test/Makefile @@ -4,9 +4,7 @@ include $(top_builddir)/src/Makefile.global TARGETS=xact distributedlog xlog -ifeq ($(enable_segwalrep), yes) TARGETS += xlogutils -endif include $(top_builddir)/src/backend/mock.mk diff --git a/src/backend/cdb/test/Makefile b/src/backend/cdb/test/Makefile index b1ffd649cb..3d077f72ad 100644 --- a/src/backend/cdb/test/Makefile +++ b/src/backend/cdb/test/Makefile @@ -8,9 +8,7 @@ TARGETS=cdbtm \ cdbsrlz \ cdbdistributedsnapshot -ifeq ($(enable_segwalrep), yes) TARGETS += cdbappendonlystorage cdbmirroredappendonly -endif include $(top_builddir)/src/backend/mock.mk cdbtm.t: $(MOCK_DIR)/backend/storage/lmgr/lwlock_mock.o diff --git a/src/backend/fts/Makefile b/src/backend/fts/Makefile index 22f17de1e8..d15a5d5054 100644 --- a/src/backend/fts/Makefile +++ b/src/backend/fts/Makefile @@ -12,7 +12,5 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) OBJS = fts.o ftsprobe.o -ifeq ($(enable_segwalrep), yes) OBJS += ftsmessagehandler.o -endif include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/fts/test/Makefile b/src/backend/fts/test/Makefile index 55c31660e3..09a8d730b5 100644 --- a/src/backend/fts/test/Makefile +++ b/src/backend/fts/test/Makefile @@ -2,7 +2,6 @@ subdir=src/backend/fts top_builddir=../../../.. include $(top_builddir)/src/Makefile.global -ifeq ($(enable_segwalrep), yes) TARGETS=ftsmessagehandler ftsprobe fts include $(top_builddir)/src/backend/mock.mk @@ -30,4 +29,3 @@ fts.t: \ $(MOCK_DIR)/backend/catalog/indexing_mock.o \ $(MOCK_DIR)/backend/access/common/scankey_mock.o \ $(MOCK_DIR)/backend/access/index/genam_mock.o -endif diff --git a/src/backend/replication/test/Makefile b/src/backend/replication/test/Makefile index 41d68990f5..0b3afc6054 100644 --- a/src/backend/replication/test/Makefile +++ b/src/backend/replication/test/Makefile @@ -2,7 +2,6 @@ subdir=src/backend/replication top_builddir=../../../.. include $(top_builddir)/src/Makefile.global -ifeq ($(enable_segwalrep), yes) TARGETS=gp_replication include $(top_builddir)/src/backend/mock.mk @@ -13,4 +12,3 @@ gp_replication.t: \ $(MOCK_DIR)/backend/utils/misc/guc_gp_mock.o \ $(MOCK_DIR)/backend/storage/lmgr/lwlock_mock.o \ $(MOCK_DIR)/backend/storage/ipc/shmqueue_mock.o -endif diff --git a/src/backend/utils/misc/test/Makefile b/src/backend/utils/misc/test/Makefile index 55823242c9..8c09ce5f5e 100644 --- a/src/backend/utils/misc/test/Makefile +++ b/src/backend/utils/misc/test/Makefile @@ -4,9 +4,7 @@ include $(top_builddir)/src/Makefile.global TARGETS = ps_status bitstream bitmap_compression -ifeq ($(enable_segwalrep), yes) TARGETS += guc_gp -endif include $(top_builddir)/src/backend/mock.mk diff --git a/src/test/isolation2/Makefile b/src/test/isolation2/Makefile index 84e9793830..40c207606c 100644 --- a/src/test/isolation2/Makefile +++ b/src/test/isolation2/Makefile @@ -20,9 +20,7 @@ endif override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS) override LDLIBS := $(libpq_pgport) $(LDLIBS) -ifeq ($(enable_segwalrep), yes) EXTRA_TESTS=segwalrep/commit_blocking segwalrep/fts_unblock_primary -endif all: pg_isolation2_regress$(X) all-lib diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 874160268b..6b32741c50 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -180,9 +180,7 @@ pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MUL # These are currently skipped because they don't work yet for segment wal replication # segspace: cannot restart database at the moment # filespace: segment wal replication does not handle filespaces yet -ifeq ($(enable_segwalrep), yes) pg_regress_call := $(pg_regress_call) --exclude-tests="segspace_setup segspace segspace_cleanup filespace" -endif check: all $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule diff --git a/src/test/walrep/Makefile b/src/test/walrep/Makefile index 1f6971215f..836bd09f3a 100644 --- a/src/test/walrep/Makefile +++ b/src/test/walrep/Makefile @@ -11,13 +11,11 @@ REGRESS = setup walreceiver # These two tests can only run without mirrors due to limit of 1 # walsender-walreceiver connection only -ifeq ($(enable_segwalrep), yes) ifeq ($(WITH_MIRRORS), false) REGRESS += generate_ao_xlog generate_aoco_xlog replication_views_mirrorless else REGRESS += replication_views_mirrored missing_xlog endif -endif REGRESS_OPTS = --dbname="walrep_regression" NO_PGXS = 1 -- GitLab