Commit7fc44d1

authored

Merge pull request#66 from cybertec-postgresql/cleanup

Remove test_top_build_dir

2 parents3a912fc +f3823cf commit7fc44d1Copy full SHA for 7fc44d1

File tree

-15

lines changed

-15

lines changed

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,18 +132,12 @@ ifeq ($(has_explain_summary),y)`
`132`	`132`	`endif`
`133`	`133`	`endif`
`134`	`134`
`135`		`-ifeq ($(pg_version_9_5_plus),y)`
`136`		`-PGS_TMP_DIR = --temp-instance=tmp_check`
`137`		`-else`
`138`		`-PGS_TMP_DIR = --temp-install=tmp_check --top-builddir=test_top_build_dir`
`139`		`-endif`
`140`		`-`
`141`	`135`	`test: pg_sphere.test.sql sql/init_test.sql`
`142`	`136`	`cp expected/init_test.out.in expected/init_test.out`
`143`	`137`	`ifneq ($(USE_HEALPIX),0)`
`144`	`138`	`cat expected/init_test_healpix.out.in >> expected/init_test.out`
`145`	`139`	`endif`
`146`		`-$(pg_regress_installcheck)$(PGS_TMP_DIR) $(REGRESS_OPTS) $(TESTS)`
	`140`	`+$(pg_regress_installcheck)--temp-instance=tmp_check $(REGRESS_OPTS) $(TESTS)`
`147`	`141`
`148`	`142`	`pg_sphere.test.sql:$(RELEASE_SQL)$(shlib)`
`149`	`143`	`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 \`
`188`	`182`
`189`	`183`	`# create "alter extension" files`
`190`	`184`
`191`		`-`
`192`		`-ifeq ($(pg_version_9_5_plus),y)`
`193`		`-# 1.1.1.5 -> 1.1.5.1 for Postgres 9.5+ features`
`194`		`-else`
`195`		`-endif`
`196`		`-`
`197`	`185`	`# local stuff follows here`
`198`	`186`	`AUGMENT_GAVO_111 =$(AUGMENT_UNP_111)# for vanilla 1.1.1 users`
`199`	`187`	`ifneq ($(USE_HEALPIX),0)`

Lines changed: 0 additions & 2 deletions

This file was deleted.

Comments

(0)