Commit3188527

committed

Fix tap tests running in docker

1 parent791e9b3 commit3188527Copy full SHA for 3188527

File tree

+18

-6

lines changed

+18

-6

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ PGFILEDESC = "ptrack - block-level incremental backup engine"`
`10`	`10`
`11`	`11`	`EXTRA_CLEAN =$(EXTENSION)--$(EXTVERSION).sql`
`12`	`12`
	`13`	`+TAP_TESTS = 1`
	`14`	`+`
`13`	`15`	`ifdefUSE_PGXS`
`14`	`16`	`PG_CONFIG ?= pg_config`
`15`	`17`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`@@ -24,9 +26,9 @@ endif`
`24`	`26`	`$(EXTENSION)--$(EXTVERSION).sql: ptrack.sql`
`25`	`27`	`cat$^>$@`
`26`	`28`
`27`		`-temp-install: EXTRA_INSTALL=contrib/ptrack`
	`29`	`+#temp-install: EXTRA_INSTALL=contrib/ptrack`
`28`	`30`
`29`		`-check-tap: temp-install`
`30`		`-$(prove_check)`
	`31`	`+#check-tap: temp-install`
	`32`	`+#$(prove_check)`
`31`	`33`
`32`		`-check: check-tap`
	`34`	`+#check: check-tap`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,12 @@ git clone https://github.com/ololobus/pg_probackup.git --depth=1 -b ptrack-tests`
`31`	`31`
`32`	`32`	`# Compile and install Postgres`
`33`	`33`	`cd postgres# Go to postgres dir`
	`34`	`+`
	`35`	`+# XXX: Hackish way to run tap tests`
	`36`	`+mkdir contrib/ptrack`
	`37`	`+cp ../* contrib/ptrack/`
	`38`	`+cp -R ../t contrib/ptrack/`
	`39`	`+`
`34`	`40`	`echo"############### Applying ptrack patch"`
`35`	`41`	`git apply -v -3 ../patches/$PG_BRANCH-ptrack-core.diff`
`36`	`42`
`@@ -91,17 +97,21 @@ else`
`91`	`97`	`done`
`92`	`98`	`fi`
`93`	`99`
	`100`	`+# Exit virtualenv`
	`101`	`+deactivate`
	`102`	`+`
`94`	`103`	`# Get back to testdir`
`95`	`104`	`cd ..`
`96`	`105`
`97`	`106`	`# Run tap tests`
`98`		`-make USE_PGXS=1 check\|\| status=$?`
	`107`	`+echo"############### Running tap tests"`
	`108`	`+make -C postgres/contrib/ptrack check\|\| status=$?`
`99`	`109`
`100`	`110`	`# Generate *.gcov files`
`101`	`111`	`gcov src/.c src/.h`
`102`	`112`
`103`	`113`	`# Send coverage stats to Codecov`
`104`	`114`	`bash<(curl -s https://codecov.io/bash)`
`105`	`115`
`106`		`-# Something went wrong, exit with code 1 now`
	`116`	`+# Something went wrong, exit with code 1`
`107`	`117`	`if [$status-ne 0 ];thenexit 1;fi`

Comments

(0)