From 95fef541c207c9060d3d765e6049ca3752c840a6 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Wed, 9 Jan 2019 11:21:13 -0600 Subject: [PATCH] kernel: test: improve error handler print output from last command that failed. Signed-off-by: Jose Carlos Venegas Munoz --- kernel/build-kernel.sh | 2 +- kernel/build-kernel_test.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/kernel/build-kernel.sh b/kernel/build-kernel.sh index 72d3e8d86..4284e4f63 100755 --- a/kernel/build-kernel.sh +++ b/kernel/build-kernel.sh @@ -296,10 +296,10 @@ main() { if [ -z "${kernel_path}" ]; then config_version=$(get_config_version) kernel_path="${PWD}/kata-linux-${kernel_version}-${config_version}" + info "Config version: ${config_version}" fi info "Kernel version: ${kernel_version}" - info "Config version: ${config_version}" case "${subcmd}" in build) diff --git a/kernel/build-kernel_test.sh b/kernel/build-kernel_test.sh index 1ff0bae65..8a4fb5a4d 100755 --- a/kernel/build-kernel_test.sh +++ b/kernel/build-kernel_test.sh @@ -7,6 +7,7 @@ set -o errexit set -o nounset set -o pipefail +set -o errtrace readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" readonly build_kernel_sh="${script_dir}/build-kernel.sh" @@ -17,6 +18,16 @@ exit_handler() { } trap exit_handler EXIT +err_report() { + echo "Error:" + echo "line: $1" + echo "Last saved output:" + echo "${out:-}" +} + +trap 'err_report $LINENO' ERR + + OK() { echo "OK" }