Merge "run_functests: handle build without tar"
This commit is contained in:
commit
f6aeae70c1
@ -162,6 +162,7 @@ function run_disk_element_test() {
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "tar" =~ "$output_format" ]]; then
|
||||
# check inside the tar for sentinel files
|
||||
if ! [ -f "$dest_dir/image.tar" ]; then
|
||||
echo "Error: Build failed for element: $element, test-element: $test_element."
|
||||
@ -173,11 +174,13 @@ function run_disk_element_test() {
|
||||
echo "Error: Element: $element, test-element $test_element should have failed, but passed."
|
||||
logfile_status "FAIL" "${logfile}"
|
||||
exit 1
|
||||
else
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# if we got here, the test passed
|
||||
echo "PASS: Element $element, test-element: $test_element"
|
||||
logfile_status "PASS" "${logfile}"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if [ -f "${dest_dir}/dib-test-should-fail" ]; then
|
||||
echo "PASS: Element $element, test-element: $test_element"
|
||||
|
Loading…
Reference in New Issue
Block a user