Made existing tests comply to upcomming prescriptions for failure messages

This commit is contained in:
2011-08-05 15:43:58 +00:00
parent 136c3adf6c
commit bbfe2e7a6e
4 changed files with 21 additions and 21 deletions

View File

@ -102,7 +102,7 @@ if test -e "$dev"
then
if test "$any_media" = 1 -a -f "$dev"
then
echo "FAIL: ${SELF} : --dev $dev leads to an existing regular file"
echo "FAIL : ${SELF} : --dev $dev leads to an existing regular file"
echo
cleanup
exit 31
@ -110,7 +110,7 @@ then
else
if test "$any_media" = "0"
then
echo "FAIL: ${SELF} : --dev $dev does not lead to an existing file"
echo "FAIL : ${SELF} : --dev $dev does not lead to an existing file"
echo
cleanup
exit 31
@ -125,7 +125,7 @@ set -e
if test "$ret" -ne 0
then
echo "$res" >&2
echo "FAIL: ${SELF} : Non-zero exit value $ret with: $RELENG_XORRISO -outdev $dev"
echo "FAIL : ${SELF} : Non-zero exit value $ret with: $RELENG_XORRISO -outdev $dev"
echo
cleanup
exit 1
@ -141,7 +141,7 @@ then
echo "Recognized as re-usable."
elif test "$media" = "is not recognizable"
then
echo "FAIL: ${SELF} : No recognizable media detected in: '$dev'"
echo "FAIL : ${SELF} : No recognizable media detected in: '$dev'"
echo
cleanup
exit 2
@ -149,7 +149,7 @@ then
then
echo "Accepted media only because of option --any_media : '$media'"
else
echo "FAIL: ${SELF} : No re-usable media detected, but: '$media'"
echo "FAIL : ${SELF} : No re-usable media detected, but: '$media'"
echo
cleanup
exit 2
@ -168,7 +168,7 @@ ret=$?
set -e
if test "$ret" -ne 0
then
echo "FAIL: ${SELF} : Non-zero exit value with burn run: $ret"
echo "FAIL : ${SELF} : Non-zero exit value with burn run: $ret"
echo
cleanup
exit 1
@ -176,7 +176,7 @@ fi
if test "$SIMULATE_FAILURE" = 1
then
echo "FAIL: ${SELF} : Simulated failure caused by option -f"
echo "FAIL : ${SELF} : Simulated failure caused by option -f"
if test -f "$dev"
then
# Alter image
@ -202,7 +202,7 @@ ret=$?
set -e
if test "$ret" -ne 0
then
echo "FAIL: ${SELF} : Non-zero exit value with checkread run: $ret"
echo "FAIL : ${SELF} : Non-zero exit value with checkread run: $ret"
echo
cleanup
exit 1