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

Merge "run_functests: handle build without tar"

Browse Source
This commit is contained in:
Zuul 2020-03-31 05:03:05 +00:00 committed by Gerrit Code Review
commit f6aeae70c1
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/run_functests.sh
View File

@ -162,22 +162,25 @@ function run_disk_element_test() {
fi fi
fi fi
# check inside the tar for sentinel files if [[ "tar" =~ "$output_format" ]]; then
if ! [ -f "$dest_dir/image.tar" ]; then # check inside the tar for sentinel files
echo "Error: Build failed for element: $element, test-element: $test_element." if ! [ -f "$dest_dir/image.tar" ]; then
echo "No image $dest_dir/image.tar found!" echo "Error: Build failed for element: $element, test-element: $test_element."
logfile_status "FAIL" "${logfile}" echo "No image $dest_dir/image.tar found!"
exit 1
else
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."
logfile_status "FAIL" "${logfile}" logfile_status "FAIL" "${logfile}"
exit 1 exit 1
else else
echo "PASS: Element $element, test-element: $test_element" if tar -tf $dest_dir/image.tar | grep -q /tmp/dib-test-should-fail; then
logfile_status "PASS" "${logfile}" echo "Error: Element: $element, test-element $test_element should have failed, but passed."
logfile_status "FAIL" "${logfile}"
exit 1
fi
fi fi
fi fi
# if we got here, the test passed
echo "PASS: Element $element, test-element: $test_element"
logfile_status "PASS" "${logfile}"
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"