github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-04 02:14:29 +00:00
Code Issues Projects Releases Wiki Activity

kernel: test: improve error handler

Browse Source 
print output from  last command that failed.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz
2019-01-09 11:21:13 -06:00
parent 789970bc43
commit 95fef541c2
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/build-kernel.sh
View File

@@ -296,10 +296,10 @@ main() {
if [ -z "${kernel_path}" ]; then if [ -z "${kernel_path}" ]; then
config_version=$(get_config_version) config_version=$(get_config_version)
kernel_path="${PWD}/kata-linux-${kernel_version}-${config_version}" kernel_path="${PWD}/kata-linux-${kernel_version}-${config_version}"
info "Config version: ${config_version}"
fi fi
info "Kernel version: ${kernel_version}" info "Kernel version: ${kernel_version}"
info "Config version: ${config_version}"
case "${subcmd}" in case "${subcmd}" in
build) build)

11
kernel/build-kernel_test.sh
View File

@@ -7,6 +7,7 @@
set -o errexit set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
set -o errtrace
readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
readonly build_kernel_sh="${script_dir}/build-kernel.sh" readonly build_kernel_sh="${script_dir}/build-kernel.sh"
@@ -17,6 +18,16 @@ exit_handler() {
} }
trap exit_handler EXIT trap exit_handler EXIT
err_report() {
echo "Error:"
echo "line: $1"
echo "Last saved output:"
echo "${out:-}"
}
trap 'err_report $LINENO' ERR
OK() { OK() {
echo "OK" echo "OK"
} }