Commit5a2486d

committed

Another version of installcheck to run docker tests correctly

1 parent93eda98 commit5a2486dCopy full SHA for 5a2486d

File tree

+15

-10

lines changed

+15

-10

lines changed

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,18 +22,16 @@ include $(top_builddir)/src/Makefile.global`
`22`	`22`	`include$(top_srcdir)/contrib/contrib-global.mk`
`23`	`23`	`endif`
`24`	`24`
	`25`	`+EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/test.conf`
	`26`	`+`
`25`	`27`	`$(EXTENSION)--$(EXTVERSION).sql: init.sql`
`26`	`28`	`cat$^>$@`
`27`	`29`
`28`	`30`	`ISOLATIONCHECKS=corner_cases`
`29`	`31`
`30`	`32`	`check: isolationcheck`
`31`	`33`
`32`		`-installcheck:`
`33`		`-$(pg_isolation_regress_installcheck)$(ISOLATIONCHECKS)`
`34`		`-`
`35`		`-submake-isolation:`
`36`		`-$(MAKE) -C$(top_builddir)/src/test/isolation all`
	`34`	`+installcheck: isolationcheck-install-force`
`37`	`35`
`38`	`36`	`isolationcheck: \| submake-isolation temp-install`
`39`	`37`	`$(MKDIR_P) isolation_output`
`@@ -42,4 +40,14 @@ isolationcheck: \| submake-isolation temp-install`
`42`	`40`	`--outputdir=isolation_output\`
`43`	`41`	`$(ISOLATIONCHECKS)`
`44`	`42`
	`43`	`+isolationcheck-install-force: all \| submake-isolation submake-pg_query_state temp-install`
	`44`	`+$(pg_isolation_regress_installcheck)\`
	`45`	`+$(ISOLATIONCHECKS)`
	`46`	`+`
	`47`	`+submake-isolation:`
	`48`	`+$(MAKE) -C$(top_builddir)/src/test/isolation all`
	`49`	`+`
	`50`	`+submake-pg_query_state:`
	`51`	`+$(MAKE) -C$(top_builddir)/contrib/pg_query_state`
	`52`	`+`
`45`	`53`	`temp-install: EXTRA_INSTALL=contrib/pg_query_state`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -138,17 +138,14 @@ fi`
`138`	`138`	`# something's wrong, exit now!`
`139`	`139`	`if [$status-ne 0 ];then cat /tmp/postgres.log;exit 1;fi`
`140`	`140`
`141`		`-cd$CUSTOM_PG_SRC`
`142`		`-`
`143`	`141`	`# run regression tests`
`144`	`142`	`export PG_REGRESS_DIFF_OPTS="-w -U3"# for alpine's diff (BusyBox)`
`145`		`-make -C$CUSTOM_PG_SRC/contrib/pg_query_state installcheck\|\| status=$?`
	`143`	`+cd$CUSTOM_PG_SRC/contrib/pg_query_state`
	`144`	`+make installcheck\|\| status=$?`
`146`	`145`
`147`	`146`	`# show diff if it exists`
`148`	`147`	`if [-f regression.diffs ];then cat regression.diffs;fi`
`149`	`148`
`150`		`-cd$CUSTOM_PG_SRC/contrib/pg_query_state`
`151`		`-`
`152`	`149`	`# run python tests`
`153`	`150`	`set +x -e`
`154`	`151`	`python3 -m venv /tmp/env&&source /tmp/env/bin/activate&&`

Comments

(0)