>From 022c2da1873de2fbc93ae524819932719ca41bdb Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 24 Jun 2013 16:47:48 +0200 Subject: [PATCH 2/2] wal_decoding: mergme: Fix test_logical_decoding Makefile --- contrib/test_logical_decoding/Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/contrib/test_logical_decoding/Makefile b/contrib/test_logical_decoding/Makefile index 0e7d5d3..3850d44 100644 --- a/contrib/test_logical_decoding/Makefile +++ b/contrib/test_logical_decoding/Makefile @@ -4,18 +4,14 @@ OBJS = test_logical_decoding.o EXTENSION = test_logical_decoding DATA = test_logical_decoding--1.0.sql -ifdef USE_PGXS -PG_CONFIG = pg_config -PGXS := $(shell $(PG_CONFIG) --pgxs) -include $(PGXS) -else +# Note: because we don't tell the Makefile there are any regression tests, +# we have to clean those result files explicitly +EXTRA_CLEAN = -r $(pg_regress_clean_files) + subdir = contrib/test_logical_decoding top_builddir = ../.. include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk -endif - -test_logical_decoding.o: test_logical_decoding.c # Disabled because these tests require "wal_level=logical", which # typical installcheck users do not have (e.g. buildfarm clients). -- 1.8.2.rc2.4.g7799588.dirty