]> granicus.if.org Git - postgresql/commitdiff
Redirect install output of make check into a log file
authorAndrew Dunstan <andrew@dunslane.net>
Thu, 23 Jul 2015 13:44:20 +0000 (09:44 -0400)
committerAndrew Dunstan <andrew@dunslane.net>
Thu, 23 Jul 2015 13:53:46 +0000 (09:53 -0400)
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.

src/Makefile.global.in
src/test/modules/test_ddl_deparse/.gitignore

index 8eab178ebd3822deb015f7dd1f5f4037a315045b..46331194a3a43ae070e4d86eba5b07f4af48bca0 100644 (file)
@@ -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@
index 6628455c0ad8b782110a340a6cdab4d29b06a215..3337b3d2944330fed60643dbf34e0dffb18a4a8f 100644 (file)
@@ -1 +1,2 @@
+/log/
 /results/