Skip to content

Commit 5dd0e75

Browse files
tglsfdcjaki
authored andcommitted
Integrate pg_bsd_indent into our build/test infrastructure.
YB: discard changes to - src/meson.build since meson is unrelated at this point (use make instead) - src/tools/pg_bsd_indent since it is already up-to-date as of later commit be31ac2. Update the Makefile and build directions for in-tree build, and add Meson build infrastructure. Also convert the ad-hoc test target into a TAP test. Currently, the Make build system will not build pg_bsd_indent by default, while the Meson system will. Both will test it during "make check-world" or "ninja test". Neither will install it automatically. (We might change some of these decisions later.) Also fix a few portability nits noted during early testing. Also, exclude pg_bsd_indent from pgindent's purview; at least for now, we'll leave it formatted similarly to the FreeBSD original. Tom Lane and Andres Freund Discussion: https://postgr.es/m/3935719.1675967430@sss.pgh.pa.us Discussion: https://postgr.es/m/20200812223409.6di3y2qsnvynao7a@alap3.anarazel.de (cherry picked from commit 156c049)
1 parent 8c9f7c1 commit 5dd0e75

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

GNUmakefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ check check-tests installcheck installcheck-parallel installcheck-tests: CHECKPR
6868
check check-tests installcheck installcheck-parallel installcheck-tests: submake-generated-headers
6969
$(MAKE) -C src/test/regress $@
7070

71-
$(call recurse,check-world,src/test src/pl src/interfaces contrib src/bin,check)
71+
$(call recurse,check-world,src/test src/pl src/interfaces contrib src/bin src/tools/pg_bsd_indent,check)
7272
$(call recurse,checkprep, src/test src/pl src/interfaces contrib src/bin)
7373

7474
$(call recurse,installcheck-world,src/test src/pl src/interfaces contrib src/bin,installcheck)

src/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,13 @@ clean:
6666
$(MAKE) -C test $@
6767
$(MAKE) -C tutorial NO_PGXS=1 $@
6868
$(MAKE) -C test/isolation $@
69+
$(MAKE) -C tools/pg_bsd_indent $@
6970

7071
distclean maintainer-clean:
7172
$(MAKE) -C test $@
7273
$(MAKE) -C tutorial NO_PGXS=1 $@
7374
$(MAKE) -C test/isolation $@
75+
$(MAKE) -C tools/pg_bsd_indent $@
7476
rm -f Makefile.port Makefile.global
7577

7678

src/tools/pgindent/exclude_file_patterns

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ src/pl/plperl/ppport\.h$
4343
src/pl/plperl/SPI\.c$
4444
src/pl/plperl/Util\.c$
4545
#
46+
# pg_bsd_indent has its own, idiosyncratic indentation style.
47+
# We'll stick to that to permit comparison with the FreeBSD upstream.
48+
src/tools/pg_bsd_indent/.*
49+
#
4650
# Exclude any temporary installations that may be in the tree.
4751
/tmp_check/
4852
/tmp_install/

0 commit comments

Comments
 (0)