Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f8ebe3b

Browse files
peterepetere
committed
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".
1 parent 625744a commit f8ebe3b

File tree

24 files changed

+74
-8
lines changed

24 files changed

+74
-8
lines changed

‎GNUmakefile.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ check: all
6060
check installcheck installcheck-parallel:
6161
$(MAKE) -C src/test $@
6262

63-
# TODO: add contrib
64-
$(call recurse,check-world,src/test src/pl src/interfaces/ecpg,check)
63+
$(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib,check)
6564

6665
$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib,installcheck)
6766

‎contrib/btree_gin/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/btree_gist/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/citext/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/cube/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/cubeparse.c
22
/cubescan.c
33
# Generated subdirectories
4+
/log/
45
/results/
6+
/tmp_check/

‎contrib/dblink/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/dict_int/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/dict_xsyn/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/earthdistance/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/earthdistance/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ EXTENSION = earthdistance
66
DATA = earthdistance--1.0.sql earthdistance--unpackaged--1.0.sql
77

88
REGRESS = earthdistance
9+
REGRESS_OPTS = --extra-install=contrib/cube
910

1011
LDFLAGS_SL += $(filter -lm, $(LIBS))
1112

‎contrib/file_fdw/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/hstore/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/intarray/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/ltree/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/pg_trgm/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/pgcrypto/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/seg/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/segparse.c
22
/segscan.c
33
# Generated subdirectories
4+
/log/
45
/results/
6+
/tmp_check/

‎contrib/tablefunc/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/test_parser/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/tsearch2/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/unaccent/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎contrib/xml2/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Generated subdirectories
2+
/log/
23
/results/
4+
/tmp_check/

‎src/makefiles/pgxs.mk

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,13 +281,14 @@ endif
281281
installcheck: submake
282282
$(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS)
283283

284-
# in-tree test doesn't work yet (no way to install my shared library)
285-
#check: all submake
286-
# $(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
284+
ifdef PGXS
287285
check:
288-
@echo "'make check' is not supported."
289-
@echo "Do 'make install', then 'make installcheck' instead."
290-
@exit 1
286+
@echo '"$(MAKE) check" is not supported.'
287+
@echo 'Do "$(MAKE) install", then "$(MAKE) installcheck" instead.'
288+
else
289+
check: all submake
290+
$(pg_regress_check) --extra-install=$(subdir) $(REGRESS_OPTS) $(REGRESS)
291+
endif
291292
endif # REGRESS
292293

293294

‎src/test/regress/pg_regress.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ static bool port_specified_by_user = false;
102102
static char *dlpath = PKGLIBDIR;
103103
static char *user = NULL;
104104
static _stringlist *extraroles = NULL;
105+
static _stringlist *extra_install = NULL;
105106

106107
/* internal variables */
107108
static const char *progname;
@@ -1896,6 +1897,7 @@ help(void)
18961897
printf(_(" --top-builddir=DIR (relative) path to top level build directory\n"));
18971898
printf(_(" --port=PORT start postmaster on PORT\n"));
18981899
printf(_(" --temp-config=PATH append contents of PATH to temporary config\n"));
1900+
printf(_(" --extra-install=DIR additional directory to install (e.g., contrib\n"));
18991901
printf(_("\n"));
19001902
printf(_("Options for using an existing installation:\n"));
19011903
printf(_(" --host=HOST use postmaster running on HOST\n"));
@@ -1943,6 +1945,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
19431945
{"use-existing", no_argument, NULL, 20},
19441946
{"launcher", required_argument, NULL, 21},
19451947
{"load-extension", required_argument, NULL, 22},
1948+
{"extra-install", required_argument, NULL, 23},
19461949
{NULL, 0, NULL, 0}
19471950
};
19481951

@@ -2042,6 +2045,9 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
20422045
case 22:
20432046
add_stringlist_item(&loadextension, optarg);
20442047
break;
2048+
case 23:
2049+
add_stringlist_item(&extra_install, optarg);
2050+
break;
20452051
default:
20462052
/* getopt_long already emitted a complaint */
20472053
fprintf(stderr, _("\nTry \"%s -h\" for more information.\n"),
@@ -2086,6 +2092,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
20862092
if (temp_install)
20872093
{
20882094
FILE *pg_conf;
2095+
_stringlist *sl;
20892096

20902097
/*
20912098
* Prepare the temp installation
@@ -2128,6 +2135,24 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
21282135
exit_nicely(2);
21292136
}
21302137

2138+
for (sl = extra_install; sl != NULL; sl = sl->next)
2139+
{
2140+
#ifndef WIN32_ONLY_COMPILER
2141+
snprintf(buf, sizeof(buf),
2142+
SYSTEMQUOTE "\"%s\" -C \"%s/%s\" DESTDIR=\"%s/install\" install >> \"%s/log/install.log\" 2>&1" SYSTEMQUOTE,
2143+
makeprog, top_builddir, sl->str, temp_install, outputdir);
2144+
#else
2145+
fprintf(stderr, _("\n%s: --extra-install option not supported on this platform\n", progname));
2146+
exit_nicely(2);
2147+
#endif
2148+
2149+
if (system(buf))
2150+
{
2151+
fprintf(stderr, _("\n%s: installation failed\nExamine %s/log/install.log for the reason.\nCommand was: %s\n"), progname, outputdir, buf);
2152+
exit_nicely(2);
2153+
}
2154+
}
2155+
21312156
/* initdb */
21322157
header(_("initializing database system"));
21332158
snprintf(buf, sizeof(buf),

0 commit comments

Comments
 (0)