aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2015-07-23 09:44:20 -0400
committerAndrew Dunstan <andrew@dunslane.net>2015-07-23 09:44:20 -0400
commit16c33c50e122e3e7d03fc7ddd5cbd105c0118234 (patch)
treee874335d5f3098121f7e6ac75ca7c16586669d6b
parent766dcfb16ca385274d510eaed01724bb3836efdd (diff)
downloadpostgresql-16c33c50e122e3e7d03fc7ddd5cbd105c0118234.tar.gz
postgresql-16c33c50e122e3e7d03fc7ddd5cbd105c0118234.zip
Redirect install output of make check into a log file
dbf2ec1a changed make check so that the installation logs get directed to stdout and stderr. Per discussion on -hackers, this patch restores saving it to a file. It is now saved in /tmp_install/log, which is created once per invocation of any make target doing regression tests. Along the way, add a missing /log/ entry to test_ddl_deparse's .gitignore. Michael Paquier.
-rw-r--r--src/Makefile.global.in5
-rw-r--r--src/test/modules/test_ddl_deparse/.gitignore1
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 8d1250d3648..e2f7211160d 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -307,9 +307,10 @@ temp-install:
ifndef NO_TEMP_INSTALL
ifeq ($(MAKELEVEL),0)
rm -rf '$(abs_top_builddir)'/tmp_install
- $(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install
+ $(MKDIR_P) '$(abs_top_builddir)'/tmp_install/log
+ $(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
endif
- $(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install || exit; done)
+ $(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install >>'$(abs_top_builddir)'/tmp_install/log/install.log || exit; done)
endif
PROVE = @PROVE@
diff --git a/src/test/modules/test_ddl_deparse/.gitignore b/src/test/modules/test_ddl_deparse/.gitignore
index 6628455c0ad..3337b3d2944 100644
--- a/src/test/modules/test_ddl_deparse/.gitignore
+++ b/src/test/modules/test_ddl_deparse/.gitignore
@@ -1 +1,2 @@
+/log/
/results/