Rename output log files
Rename output log files so they can be quickly identified as passing or failing logs just by the filename. Put them all in the same directory for similar reasons. Change-Id: I75bbe724e0d20c6561c2bf93857499cc49474250
This commit is contained in:
parent
bd54e0125e
commit
d0e1a8471d
@ -106,6 +106,22 @@ function wait_minus_n {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# This takes the status and the "$logfile" argument passed to
|
||||||
|
# disk-image-create and renames the file, so you can quickly see
|
||||||
|
# in results which tests have failed.
|
||||||
|
function logfile_status {
|
||||||
|
local status="$1"
|
||||||
|
local arg="$2"
|
||||||
|
local filename
|
||||||
|
if [[ -z "${arg// }" ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
filename="$(echo $arg | cut -f2 -d' ')"
|
||||||
|
echo "Moving ${filename} to ${filename/.log/.$status.log}"
|
||||||
|
mv "$filename" ${filename/.log/.$status.log}
|
||||||
|
}
|
||||||
|
|
||||||
# run_disk_element_test <test_element> <element> <use_tmp> <output_formats>
|
# run_disk_element_test <test_element> <element> <use_tmp> <output_formats>
|
||||||
# Run a disk-image-build build of ELEMENT including any elements
|
# Run a disk-image-build build of ELEMENT including any elements
|
||||||
# specified by TEST_ELEMENT. Pass OUTPUT_FORMAT to "-t"
|
# specified by TEST_ELEMENT. Pass OUTPUT_FORMAT to "-t"
|
||||||
@ -141,6 +157,7 @@ function run_disk_element_test() {
|
|||||||
if ! [ -f "$dest_dir/image.qcow2" ]; then
|
if ! [ -f "$dest_dir/image.qcow2" ]; then
|
||||||
echo "Error: qcow2 build failed for element: $element, test-element: $test_element."
|
echo "Error: qcow2 build failed for element: $element, test-element: $test_element."
|
||||||
echo "No image $dest_dir/image.qcow2 found!"
|
echo "No image $dest_dir/image.qcow2 found!"
|
||||||
|
logfile_status "FAIL" "${logfile}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -149,20 +166,25 @@ function run_disk_element_test() {
|
|||||||
if ! [ -f "$dest_dir/image.tar" ]; then
|
if ! [ -f "$dest_dir/image.tar" ]; then
|
||||||
echo "Error: Build failed for element: $element, test-element: $test_element."
|
echo "Error: Build failed for element: $element, test-element: $test_element."
|
||||||
echo "No image $dest_dir/image.tar found!"
|
echo "No image $dest_dir/image.tar found!"
|
||||||
|
logfile_status "FAIL" "${logfile}"
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
if tar -tf $dest_dir/image.tar | grep -q /tmp/dib-test-should-fail; then
|
if tar -tf $dest_dir/image.tar | grep -q /tmp/dib-test-should-fail; then
|
||||||
echo "Error: Element: $element, test-element $test_element should have failed, but passed."
|
echo "Error: Element: $element, test-element $test_element should have failed, but passed."
|
||||||
|
logfile_status "FAIL" "${logfile}"
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
echo "PASS: Element $element, test-element: $test_element"
|
echo "PASS: Element $element, test-element: $test_element"
|
||||||
|
logfile_status "PASS" "${logfile}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ -f "${dest_dir}/dib-test-should-fail" ]; then
|
if [ -f "${dest_dir}/dib-test-should-fail" ]; then
|
||||||
echo "PASS: Element $element, test-element: $test_element"
|
echo "PASS: Element $element, test-element: $test_element"
|
||||||
|
logfile_status "PASS" "${logfile}"
|
||||||
else
|
else
|
||||||
echo "Error: Build failed for element: $element, test-element: $test_element."
|
echo "Error: Build failed for element: $element, test-element: $test_element."
|
||||||
|
logfile_status "FAIL" "${logfile}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -379,8 +401,7 @@ for test in "${TESTS_TO_RUN[@]}"; do
|
|||||||
|
|
||||||
log_argument=' '
|
log_argument=' '
|
||||||
if [[ -n "${LOG_DIRECTORY}" ]]; then
|
if [[ -n "${LOG_DIRECTORY}" ]]; then
|
||||||
mkdir -p "${LOG_DIRECTORY}/${element}"
|
log_argument="--logfile ${LOG_DIRECTORY}/${element}_${test_element}.log"
|
||||||
log_argument="--logfile ${LOG_DIRECTORY}/${element}/${test_element}.log"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Running $test ($element_type)"
|
echo "Running $test ($element_type)"
|
||||||
|
Loading…
Reference in New Issue
Block a user