Pass -f to rm in cleanup handlers When a test fails, some of the files the cleanup handler needs to remove may not have been created, so pass -f to rm to ignore nonexistent files.
diff --git a/tests/test_cmd_animation.sh b/tests/test_cmd_animation.sh index 58a7455..07bf85b 100755 --- a/tests/test_cmd_animation.sh +++ b/tests/test_cmd_animation.sh
@@ -47,7 +47,7 @@ cleanup() { pushd ${TMP_DIR} - rm -- "${ENCODED_FILE}" "${DECODED_FILE}" "${ERROR_MSG}" + rm -f -- "${ENCODED_FILE}" "${DECODED_FILE}" "${ERROR_MSG}" popd } trap cleanup EXIT
diff --git a/tests/test_cmd_grid.sh b/tests/test_cmd_grid.sh index 2dd6aae..cfff1bc 100755 --- a/tests/test_cmd_grid.sh +++ b/tests/test_cmd_grid.sh
@@ -54,9 +54,9 @@ # Cleanup cleanup() { pushd ${TMP_DIR} - rm -- "${ENCODED_FILE}" "${DECODED_FILE}" \ - "${ENCODED_FILE_2x2}" "${DECODED_FILE_2x2}" \ - "${ENCODED_FILE_7x5}" "${DECODED_FILE_7x5}" + rm -f -- "${ENCODED_FILE}" "${DECODED_FILE}" \ + "${ENCODED_FILE_2x2}" "${DECODED_FILE_2x2}" \ + "${ENCODED_FILE_7x5}" "${DECODED_FILE_7x5}" popd } trap cleanup EXIT
diff --git a/tests/test_cmd_icc_profile.sh b/tests/test_cmd_icc_profile.sh index 166cafa..b514631 100755 --- a/tests/test_cmd_icc_profile.sh +++ b/tests/test_cmd_icc_profile.sh
@@ -55,7 +55,7 @@ # Cleanup cleanup() { pushd ${TMP_DIR} - rm -- "${ENCODED_FILE}" "${DECODED_FILE}" "${CORRECTED_FILE}" + rm -f -- "${ENCODED_FILE}" "${DECODED_FILE}" "${CORRECTED_FILE}" popd } trap cleanup EXIT
diff --git a/tests/test_cmd_lossless.sh b/tests/test_cmd_lossless.sh index 44dd012..d81a650 100755 --- a/tests/test_cmd_lossless.sh +++ b/tests/test_cmd_lossless.sh
@@ -52,7 +52,7 @@ # Cleanup cleanup() { pushd ${TMP_DIR} - rm -- "${ENCODED_FILE}" "${DECODED_FILE}" "${DECODED_FILE_LOSSLESS}" + rm -f -- "${ENCODED_FILE}" "${DECODED_FILE}" "${DECODED_FILE_LOSSLESS}" popd } trap cleanup EXIT
diff --git a/tests/test_cmd_metadata.sh b/tests/test_cmd_metadata.sh index cfbd9fc..e9c65ba 100755 --- a/tests/test_cmd_metadata.sh +++ b/tests/test_cmd_metadata.sh
@@ -54,8 +54,9 @@ # Cleanup cleanup() { pushd ${TMP_DIR} - rm -- "${ENCODED_FILE}" "${ENCODED_FILE_NO_METADATA}" "${ENCODED_FILE_MORE_METADATA}" \ - "${DECODED_FILE}" "${DECODED_FILE_CHANGED_ICC}" + rm -f -- "${ENCODED_FILE}" "${ENCODED_FILE_NO_METADATA}" \ + "${ENCODED_FILE_MORE_METADATA}" \ + "${DECODED_FILE}" "${DECODED_FILE_CHANGED_ICC}" popd } trap cleanup EXIT
diff --git a/tests/test_cmd_targetsize.sh b/tests/test_cmd_targetsize.sh index 8b00137..095cabf 100755 --- a/tests/test_cmd_targetsize.sh +++ b/tests/test_cmd_targetsize.sh
@@ -49,7 +49,8 @@ # Cleanup cleanup() { pushd ${TMP_DIR} - rm -- "${ENCODED_FILE}" "${DECODED_SMALLEST_FILE}" "${DECODED_BIGGEST_FILE}" + rm -f -- "${ENCODED_FILE}" "${DECODED_SMALLEST_FILE}" \ + "${DECODED_BIGGEST_FILE}" popd } trap cleanup EXIT