From f3823cf27886c418120ee9fef3267018c4d6af58 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 19 Sep 2023 17:20:42 +0200 Subject: [PATCH] Remove test_top_build_dir Remove special code for testing on pre-9.5 servers --- Makefile | 14 +------------- test_top_build_dir/Makefile | 2 -- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 test_top_build_dir/Makefile diff --git a/Makefile b/Makefile index 5dbdac2..db9cf59 100644 --- a/Makefile +++ b/Makefile @@ -132,18 +132,12 @@ ifeq ($(has_explain_summary),y) endif endif -ifeq ($(pg_version_9_5_plus),y) - PGS_TMP_DIR = --temp-instance=tmp_check -else - PGS_TMP_DIR = --temp-install=tmp_check --top-builddir=test_top_build_dir -endif - test: pg_sphere.test.sql sql/init_test.sql cp expected/init_test.out.in expected/init_test.out ifneq ($(USE_HEALPIX),0) cat expected/init_test_healpix.out.in >> expected/init_test.out endif - $(pg_regress_installcheck) $(PGS_TMP_DIR) $(REGRESS_OPTS) $(TESTS) + $(pg_regress_installcheck) --temp-instance=tmp_check $(REGRESS_OPTS) $(TESTS) pg_sphere.test.sql: $(RELEASE_SQL) $(shlib) tail -n+3 $< | sed 's,MODULE_PATHNAME,$(realpath $(shlib)),g' >$@ @@ -188,12 +182,6 @@ UPGRADE_1_0_PRE_AAF2D5 = contains-ops-fixes-1.sql pgs_gist_drop_spoint2.sql.in \ # create "alter extension" files - -ifeq ($(pg_version_9_5_plus),y) -# 1.1.1.5 -> 1.1.5.1 for Postgres 9.5+ features -else -endif - # local stuff follows here AUGMENT_GAVO_111 = $(AUGMENT_UNP_111) # for vanilla 1.1.1 users ifneq ($(USE_HEALPIX),0) diff --git a/test_top_build_dir/Makefile b/test_top_build_dir/Makefile deleted file mode 100644 index 80919a1..0000000 --- a/test_top_build_dir/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -install: - ln -s / ../tmp_check/install