Skip to content

Commit 732b33f

Browse files
committed
Fix up .gitignore and cleanup actions in some src/test/ subdirectories.
examples/, locale/, and thread/ lacked .gitignore files and were also not connected up to top-level "make clean" etc. This had escaped notice because none of those directories are built in normal scenarios. Still, they have working Makefiles, so if someone does a "make" in one of these directories it would be good if (a) git doesn't bleat about the product files and (b) cleaning up removes them. This is a longstanding oversight, but since this behavior is probably only of interest to developers, there seems no need for back-patching. Michael Paquier and Tom Lane
1 parent 70d44dd commit 732b33f

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

src/test/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ include $(top_builddir)/src/Makefile.global
1414

1515
SUBDIRS = regress isolation modules
1616

17-
# The SSL suite is not secure to run on a multi-user system, so don't run
18-
# it as part of global "check" target.
19-
ALWAYS_SUBDIRS = ssl
17+
# We don't build or execute examples/, locale/, or thread/ by default,
18+
# but we do want "make clean" etc to recurse into them. Likewise for ssl/,
19+
# because the SSL test suite is not secure to run on a multi-user system.
20+
ALWAYS_SUBDIRS = examples locale thread ssl
2021

2122
# We want to recurse to all subdirs for all standard targets, except that
2223
# installcheck and install should not recurse into the subdirectory "modules".

src/test/examples/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/testlibpq
2+
/testlibpq2
3+
/testlibpq3
4+
/testlibpq4
5+
/testlo
6+
/testlo64

src/test/examples/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ PROGS = testlibpq testlibpq2 testlibpq3 testlibpq4 testlo testlo64
1818

1919
all: $(PROGS)
2020

21-
clean:
22-
rm -f $(PROGS)
21+
clean distclean maintainer-clean:
22+
rm -f $(PROGS) *.o

src/test/locale/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/test-ctype

src/test/locale/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ DIRS = de_DE.ISO8859-1 gr_GR.ISO8859-7 koi8-r koi8-to-win1251
1010

1111
all: $(PROGS)
1212

13-
clean:
14-
rm -f $(PROGS)
13+
clean distclean maintainer-clean:
14+
rm -f $(PROGS) *.o
1515
for d in $(DIRS); do \
1616
$(MAKE) -C $$d clean || exit; \
1717
done

src/test/thread/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/thread_test

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy