aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Lyon <christophe.lyon@linaro.org>2016-01-22 17:35:50 +0100
committerChristophe Lyon <christophe.lyon@linaro.org>2016-01-22 17:36:06 +0100
commitbb39ff9c4ecfce43d18cf4ff88f46ec8e641b699 (patch)
tree0b2feae7bd19aa9d01d920759b95bc97f8814985
parente5f6662c755e652df1bb939623226aa9e040e0ae (diff)
tcwg-buildfarm-master-christophe: Improve trap handler.
Change-Id: Ife082438f36e6693659103c7df4f0fa67c1a6bf7
-rw-r--r--tcwg-buildfarm-master-christophe.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/tcwg-buildfarm-master-christophe.yaml b/tcwg-buildfarm-master-christophe.yaml
index 4552bef05d..1a39148379 100644
--- a/tcwg-buildfarm-master-christophe.yaml
+++ b/tcwg-buildfarm-master-christophe.yaml
@@ -173,6 +173,10 @@
cleanup_error()
{
+ # Avoid access to the console during the trap handler
+ exec 1> /dev/null
+ exec 2> /dev/null
+
sums="`find . -name \*.sum`"
if test x"${sums}" != x; then
test_logs=""
@@ -183,7 +187,8 @@
checks="`find . -name check\*.log`"
logs="`find . -name make\*.log`"
eval dir=$"log_name"
- scp build.out build.err ${sums} ${test_logs} ${check} ${logs} ${log_server}/$dir/
+ echo "Killed by signal" > killed.txt
+ scp -q killed.txt build.out build.err ${sums} ${test_logs} ${check} ${logs} ${log_server}/$dir/
cleanup_exit
}