diff options
| author | Peter Eisentraut | 2015-04-30 00:34:22 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2015-04-30 00:34:22 +0000 |
| commit | dbf2ec1a1c053379e2f9a5913979a1ca4dccbd43 (patch) | |
| tree | 994397e079f5a0c9f1bc75a78434c73a16fa38ea /src/bin | |
| parent | e0f26fc76532defd06caf79d711fa99cea83c532 (diff) | |
Fix parallel make risk with new check temp-install setup
The "check" target no longer needs to depend on "all", because it now
runs "install" directly, which in turn depends on "all". Doing both
will cause problems with parallel make, because two builds will run next
to each other.
Also remove the redirection of the temp-install output into a log file.
This was appropriate when this was done from within pg_regress, but now
it's just a regular make run, and especially with the above changes this
will now take the place of running the "all" target before the test
suites.
problem report by Jeff Janes, patch in part by Michael Paquier
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/initdb/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/pg_basebackup/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/pg_config/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/pg_controldata/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/pg_ctl/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/scripts/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index fc809a0706d..d4797880dd5 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -58,7 +58,7 @@ clean distclean maintainer-clean: # ensure that changes in datadir propagate into object file initdb.o: initdb.c $(top_builddir)/src/Makefile.global -check: all +check: $(prove_check) installcheck: diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile index 58f8b66494d..0d8421a71e5 100644 --- a/src/bin/pg_basebackup/Makefile +++ b/src/bin/pg_basebackup/Makefile @@ -50,7 +50,7 @@ clean distclean maintainer-clean: $(OBJS) rm -rf tmp_check -check: all +check: $(prove_check) installcheck: diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile index 71ce236b9e7..dbc98990fb7 100644 --- a/src/bin/pg_config/Makefile +++ b/src/bin/pg_config/Makefile @@ -49,7 +49,7 @@ clean distclean maintainer-clean: rm -f pg_config$(X) $(OBJS) rm -rf tmp_check -check: all +check: $(prove_check) installcheck: diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile index f7a4010bf80..fd7399ba98f 100644 --- a/src/bin/pg_controldata/Makefile +++ b/src/bin/pg_controldata/Makefile @@ -35,7 +35,7 @@ clean distclean maintainer-clean: rm -f pg_controldata$(X) $(OBJS) rm -rf tmp_check -check: all +check: $(prove_check) installcheck: diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile index 525e1d4750f..37eb482a5c0 100644 --- a/src/bin/pg_ctl/Makefile +++ b/src/bin/pg_ctl/Makefile @@ -38,7 +38,7 @@ clean distclean maintainer-clean: rm -f pg_ctl$(X) $(OBJS) rm -rf tmp_check -check: all +check: $(prove_check) installcheck: diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 8b6f54ccee8..c8317164f8a 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -69,7 +69,7 @@ clean distclean maintainer-clean: rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c rm -rf tmp_check -check: all +check: $(prove_check) installcheck: |