Skip to content
Snippets Groups Projects
Commit f8ebe3bc authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files

Support "make check" in contrib

Added a new option --extra-install to pg_regress to arrange installing
the respective contrib directory into the temporary installation.
This is currently not yet supported for Windows MSVC builds.

Updated the .gitignore files for contrib modules to ignore the
leftovers of a temp-install check run.

Changed the exit status of "make check" in a pgxs build (which still
does nothing) to 0 from 1.

Added "make check" in contrib to top-level "make check-world".
parent 625744ac
No related branches found
No related tags found
No related merge requests found
Showing
with 38 additions and 2 deletions
...@@ -60,8 +60,7 @@ check: all ...@@ -60,8 +60,7 @@ check: all
check installcheck installcheck-parallel: check installcheck installcheck-parallel:
$(MAKE) -C src/test $@ $(MAKE) -C src/test $@
# TODO: add contrib $(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib,check)
$(call recurse,check-world,src/test src/pl src/interfaces/ecpg,check)
$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib,installcheck) $(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib,installcheck)
......
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
/cubeparse.c /cubeparse.c
/cubescan.c /cubescan.c
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
...@@ -6,6 +6,7 @@ EXTENSION = earthdistance ...@@ -6,6 +6,7 @@ EXTENSION = earthdistance
DATA = earthdistance--1.0.sql earthdistance--unpackaged--1.0.sql DATA = earthdistance--1.0.sql earthdistance--unpackaged--1.0.sql
REGRESS = earthdistance REGRESS = earthdistance
REGRESS_OPTS = --extra-install=contrib/cube
LDFLAGS_SL += $(filter -lm, $(LIBS)) LDFLAGS_SL += $(filter -lm, $(LIBS))
......
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
/segparse.c /segparse.c
/segscan.c /segscan.c
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
# Generated subdirectories # Generated subdirectories
/log/
/results/ /results/
/tmp_check/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment