From 2a4ed929b7142b4c3727b4d82f7db579cc190791 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Thu, 2 Jun 2016 11:35:06 +0200
Subject: [PATCH] store logs via ci.hocon instead of outputting to the console
---
ci.hocon | 7 +++++++
com.oracle.truffle.r.native/gnur/Makefile.gnur | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ci.hocon b/ci.hocon
index 861d5b1f34..79f3c1da17 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -13,6 +13,13 @@ common : {
}
environment : {
}
+ logs : [
+ "com.oracle.truffle.r.native/gnur/R-*/gnur_configure.log"
+ "com.oracle.truffle.r.native/gnur/R-*/gnur_make.log"
+ "com.oracle.truffle.r.native/gnur/R-*/Makeconf"
+ "com.oracle.truffle.r.native/gnur/libiconv-*/iconv_configure.log"
+ "com.oracle.truffle.r.native/gnur/libiconv-*/iconv_make.log"
+ ]
timelimit : "1:00:00"
}
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index 8989586ab0..76eb523030 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -89,12 +89,12 @@ $(ICONV):
iconv_config: $(ICONV)/Makefile
$(ICONV)/Makefile:
- (cd $(ICONV); ./configure --prefix $(ICONV_INSTALL) $(ICONV_CONFIG_FLAGS) > iconv_configure.log 2>&1 || cat iconv_configure.log)
+ (cd $(ICONV); ./configure --prefix $(ICONV_INSTALL) $(ICONV_CONFIG_FLAGS) > iconv_configure.log 2>&1)
iconv_build: $(ICONV)/lib/libcharset.so
$(ICONV)/lib/libcharset.so:
- (cd $(ICONV); $(MAKE) MAKE=$(MAKE) && $(MAKE) MAKE=$(MAKE) install > iconv_make.log 2>&1 || cat iconv_make.log)
+ (cd $(ICONV); $(MAKE) MAKE=$(MAKE) && $(MAKE) MAKE=$(MAKE) install > iconv_make.log 2>&1)
else
GNUR_CONFIG_FLAGS := CFLAGS=-DLIBICONV_PLUG CPPFLAGS=-DLIBICONV_PLUG CXXFLAGS=-DLIBICONV_PLUG
iconv:
@@ -116,12 +116,12 @@ endif
$(GNUR_HOME)/Makefile:
ed $(GNUR_HOME)/src/extra/xz/Makefile.in < patchXzMakefile
- (cd $(GNUR_HOME); ./configure --with-x=no --without-recommended-packages $(GNUR_CONFIG_FLAGS) > gnur_configure.log 2>&1 || cat gnur_configure.log)
+ (cd $(GNUR_HOME); ./configure --with-x=no --without-recommended-packages $(GNUR_CONFIG_FLAGS) > gnur_configure.log 2>&1)
build: $(GNUR_HOME)/bin/R
$(GNUR_HOME)/bin/R: $(GNUR_HOME)/Makeconf
- (cd $(GNUR_HOME); $(MAKE) MAKE=$(MAKE) -j > gnur_make.log 2>&1 || cat gnur_make.log)
+ (cd $(GNUR_HOME); $(MAKE) MAKE=$(MAKE) -j > gnur_make.log 2>&1)
clean: cleangnur cleaniconv
rm -f Makeconf.done
--
GitLab