NotificationsYou must be signed in to change notification settings
Fork26
Star157

Commitc9f90cb

Maxim Orlov

committed

fixes in Makefile

In order to be ready to the meson build and be ableto support parallel installcheck do the following: - fix use of USE_MODULE_DB - isolation target should be included from the gloabl makefile - reorder vars to make it easy to read+ fix out of source check targettags: pg_query_state

1 parent277fbbe commitc9f90cbCopy full SHA for c9f90cb

File tree

1 file changed

+18

-1

lines changed

Makefile

1 file changed

+18

-1

lines changed

`‎Makefile`

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,20 @@ EXTVERSION = 1.1`
`8`	`8`	`DATA = pg_query_state--1.0--1.1.sql`
`9`	`9`	`DATA_built =$(EXTENSION)--$(EXTVERSION).sql`
`10`	`10`	`PGFILEDESC = "pg_query_state - facility to track progress of plan execution"`
`11`		`-EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/test.conf`
	`11`	`+`
`12`	`12`	`EXTRA_CLEAN = ./isolation_output$(EXTENSION)--$(EXTVERSION).sql\`
`13`	`13`	`Dockerfile ./tests/*.pyc ./tmp_stress`
`14`	`14`
	`15`	`+ISOLATION = corner_cases`
	`16`	`+#`
	`17`	`+# PG11 doesn't support ISOLATION_OPTS variable. We have to use`
	`18`	`+# "CREATE/DROP EXTENTION" command in spec.`
	`19`	`+#`
	`20`	`+# One day, when we'll get rid of PG11, it will be possible to uncomment this`
	`21`	`+# variable and remove "CREATE EXTENTION" from spec.`
	`22`	`+#`
	`23`	`+# ISOLATION_OPTS = --load-extension=pg_query_state`
	`24`	`+`
`15`	`25`	`ifdefUSE_PGXS`
`16`	`26`	`PG_CONFIG ?= pg_config`
`17`	`27`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`@@ -21,11 +31,17 @@ subdir = contrib/pg_query_state`
`21`	`31`	`top_builddir = ../..`
`22`	`32`	`include$(top_builddir)/src/Makefile.global`
`23`	`33`	`include$(top_srcdir)/contrib/contrib-global.mk`
	`34`	`+# need this to provide make check in case of "in source" build`
	`35`	`+EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/test.conf`
`24`	`36`	`endif`
`25`	`37`
`26`	`38`	`$(EXTENSION)--$(EXTVERSION).sql: init.sql`
`27`	`39`	`cat$^>$@`
`28`	`40`
	`41`	`+#`
	`42`	`+# Make conditional targets to save backward compatibility with PG11.`
	`43`	`+#`
	`44`	`+ifeq ($(MAJORVERSION),11)`
`29`	`45`	`ISOLATIONCHECKS = corner_cases`
`30`	`46`
`31`	`47`	`check: isolationcheck`
`@@ -46,3 +62,4 @@ submake-isolation:`
`46`	`62`	`$(MAKE) -C$(top_builddir)/src/test/isolation all`
`47`	`63`
`48`	`64`	`temp-install: EXTRA_INSTALL=contrib/pg_query_state`
	`65`	`+endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc9f90cb

File tree

1 file changed

1 file changed

`‎Makefile`

0 commit comments