git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 70d44dd)

Fix up .gitignore and cleanup actions in some src/test/ subdirectories.

author Tom Lane <tgl@sss.pgh.pa.us>

2015年4月24日 21:13:06 +0000 (17:13 -0400)

committer Tom Lane <tgl@sss.pgh.pa.us>

2015年4月24日 21:13:06 +0000 (17:13 -0400)

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

src/test/Makefile patch | blob | blame | history

src/test/examples/.gitignore [new file with mode: 0644] patch | blob

src/test/examples/Makefile patch | blob | blame | history

src/test/locale/.gitignore [new file with mode: 0644] patch | blob

src/test/locale/Makefile patch | blob | blame | history

src/test/thread/.gitignore [new file with mode: 0644] patch | blob

diff --git a/src/test/Makefile b/src/test/Makefile

index b7cddc895215a9148946190461f3334a2676a443..b713c2c9c64a54bad8950c342afe119dd4e779e9 100644 (file)

--- a/src/test/Makefile

+++ b/src/test/Makefile

@@ -14,9 +14,10 @@ include $(top_builddir)/src/Makefile.global

SUBDIRS = regress isolation modules

-# The SSL suite is not secure to run on a multi-user system, so don't run

-# it as part of global "check" target.

-ALWAYS_SUBDIRS = ssl

+# We don't build or execute examples/, locale/, or thread/ by default,

+# but we do want "make clean" etc to recurse into them. Likewise for ssl/,

+# because the SSL test suite is not secure to run on a multi-user system.

+ALWAYS_SUBDIRS = examples locale thread ssl

# We want to recurse to all subdirs for all standard targets, except that

# installcheck and install should not recurse into the subdirectory "modules".

diff --git a/src/test/examples/.gitignore b/src/test/examples/.gitignore

new file mode 100644 (file)
index 0000000..1957ec1

--- /dev/null

+++ b/src/test/examples/.gitignore

@@ -0,0 +1,6 @@

+/testlibpq

+/testlibpq2

+/testlibpq3

+/testlibpq4

+/testlo

+/testlo64

diff --git a/src/test/examples/Makefile b/src/test/examples/Makefile

index aee5c044075885e15de65ffef5be0951ed538f99..31da210a3175a5428a3fcd4a6cf28ca9866d53bd 100644 (file)

--- a/src/test/examples/Makefile

+++ b/src/test/examples/Makefile

@@ -18,5 +18,5 @@ PROGS = testlibpq testlibpq2 testlibpq3 testlibpq4 testlo testlo64

all: $(PROGS)

-clean:

- rm -f $(PROGS)

+clean distclean maintainer-clean:

+ rm -f $(PROGS) *.o

diff --git a/src/test/locale/.gitignore b/src/test/locale/.gitignore

new file mode 100644 (file)
index 0000000..620d3df

--- /dev/null

+++ b/src/test/locale/.gitignore

@@ -0,0 +1 @@

+/test-ctype

diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile

index c71dc2dbbf22def6e899e1cada8901e53532315e..26ec5c9a904c231e8636dc96834a5d9be191d15f 100644 (file)

--- a/src/test/locale/Makefile

+++ b/src/test/locale/Makefile

@@ -10,8 +10,8 @@ DIRS = de_DE.ISO8859-1 gr_GR.ISO8859-7 koi8-r koi8-to-win1251

all: $(PROGS)

-clean:

- rm -f $(PROGS)

+clean distclean maintainer-clean:

+ rm -f $(PROGS) *.o

for d in $(DIRS); do \

$(MAKE) -C $$d clean || exit; \

done

diff --git a/src/test/thread/.gitignore b/src/test/thread/.gitignore

new file mode 100644 (file)
index 0000000..1d54d54

--- /dev/null

+++ b/src/test/thread/.gitignore

@@ -0,0 +1 @@

+/thread_test

This is the main PostgreSQL git repository.