sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Capture ramdisk test run logs

Browse Source 
I'm not sure why, but run_ramdisk_element_test is not using the same
interface as run_disk_element_test, despite being called the same way.
Update it so we are capturing logs.

Change-Id: I41b6a3f2d6e5466b340677c6252b7646c1dc2663
This commit is contained in:
Ian Wienand 2018-11-22 14:13:11 +11:00
parent f86d443dfa
commit bc6f9f64d8
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/run_functests.sh
View File

@ -122,7 +122,7 @@ function logfile_status {
mv "$filename" ${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_format> <logfile>
# 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"
function run_disk_element_test() { function run_disk_element_test() {
@ -198,28 +198,42 @@ function run_disk_element_test() {
fi fi
} }
# run_ramdisk_element_test <test_element> <element> # run_ramdisk_element_test <test_element> <element> <use_tmp> <output_formats>
# Run a disk-image-builder default build of ELEMENT including any # Run a disk-image-builder default build of ELEMENT including any
# elements specified by TEST_ELEMENT # elements specified by TEST_ELEMENT
function run_ramdisk_element_test() { function run_ramdisk_element_test() {
local test_element=$1 local test_element=$1
local element=$2 local element=$2
local dont_use_tmp=$3
local output_format="$4" # ignored here
local logfile="$5"
local dest_dir=$(mktemp -d) local dest_dir=$(mktemp -d)
local use_tmp_flag=""
if [ "${dont_use_tmp}" = "yes" ]; then
use_tmp_flag="--no-tmpfs"
fi
if ELEMENTS_PATH=$DIB_ELEMENTS/$element/test-elements \ if ELEMENTS_PATH=$DIB_ELEMENTS/$element/test-elements \
$DIB_CMD -x -o $dest_dir/image $element $test_element \ $DIB_CMD -x -o ${dest_dir}/image \
${logfile} \
${use_tmp_flag} \
${element} ${test_element} 2>&1 \
| log_with_prefix "${element}/${test_element}"; then | log_with_prefix "${element}/${test_element}"; then
# TODO(dtantsur): test also kernel presence once we sort out its naming # TODO(dtantsur): test also kernel presence once we sort out its naming
# problem (vmlinuz vs kernel) # problem (vmlinuz vs kernel)
if ! [ -f "$dest_dir/image.initramfs" ]; then if ! [ -f "$dest_dir/image.initramfs" ]; 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.initramfs found!" echo "No image $dest_dir/image.initramfs found!"
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
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
} }