From 6eaf3659eaa276828c125b33b212cdf5ddd6695a Mon Sep 17 00:00:00 2001 From: Simon Butcher Date: Sun, 10 Apr 2016 15:11:27 +0100 Subject: [PATCH] Fixes Travis post-mortem script dump following review Changes made: * Added copyright and project statement * Limited size of each file to dump to 1Mbyte * Changed name of script --- .travis.yml | 2 +- .../{travis-log.sh => travis-log-failure.sh} | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) rename tests/scripts/{travis-log.sh => travis-log-failure.sh} (70%) diff --git a/.travis.yml b/.travis.yml index 6aca79eaf..fa01e5a24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ script: - tests/scripts/curves.pl - tests/scripts/key-exchanges.pl after_failure: -- tests/scripts/travis-log.sh +- tests/scripts/travis-log-failure.sh env: global: secure: "barHldniAfXyoWOD/vcO+E6/Xm4fmcaUoC9BeKW+LwsHqlDMLvugaJnmLXkSpkbYhVL61Hzf3bo0KPJn88AFc5Rkf8oYHPjH4adMnVXkf3B9ghHCgznqHsAH3choo6tnPxaFgOwOYmLGb382nQxfE5lUdvnM/W/psQjWt66A1+k=" diff --git a/tests/scripts/travis-log.sh b/tests/scripts/travis-log-failure.sh similarity index 70% rename from tests/scripts/travis-log.sh rename to tests/scripts/travis-log-failure.sh index fead2c1b7..9866ca7da 100755 --- a/tests/scripts/travis-log.sh +++ b/tests/scripts/travis-log-failure.sh @@ -1,10 +1,18 @@ #!/bin/sh +# travis-log-failure.sh +# +# This file is part of mbed TLS (https://tls.mbed.org) +# +# Copyright (c) 2016, ARM Limited, All Rights Reserved +# +# Purpose +# # List the server and client logs on failed ssl-opt.sh and compat.sh tests. # This script is used to make the logs show up in the Travis test results. - +# # Some of the logs can be very long: this means usually a couple of megabytes -# but it can bee much more. For example, the client log of test 273 in ssl-opt.sh +# but it can be much more. For example, the client log of test 273 in ssl-opt.sh # is more than 630 Megabytes long. if [ -d include/mbedtls ]; then :; else @@ -13,13 +21,14 @@ if [ -d include/mbedtls ]; then :; else fi FILES="o-srv-*.log o-cli-*.log c-srv-*.log c-cli-*.log o-pxy-*.log" +MAX_LOG_SIZE=1048576 for PATTERN in $FILES; do for LOG in $( ls tests/$PATTERN 2>/dev/null ); do echo echo "****** BEGIN file: $LOG ******" echo - cat $LOG + tail -c $MAX_LOG_SIZE $LOG echo "****** END file: $LOG ******" echo rm $LOG