Adapted test_hardlinks to newest agreements with George

master
Thomas Schmitt 12 years ago
parent d417ba720e
commit bf4e56a779
  1. 17
      releng/test_hardlinks

@ -7,7 +7,7 @@
export prog=$(basename "$0")
export xorriso=xorriso
export workdir=./tmp/"$prog"
export workdir=./releng_generated_data/"$prog"
export image_file="$workdir"/xorriso_hardlinks.iso
export on_disk="$workdir"/xorriso_hardlinks_test_dir
export in_iso=""
@ -26,20 +26,11 @@ config_by_var() {
# Variables get set to empty content to keep them from being applied
# more than once and thus overriding settings of higher precedence.
# >>> The short names are not good.
# >>> Environment variables should have a common prefix. Like RELENG_
# >>> In general, the names should be a bit more expressive.
# >>> Like RELENG_XORRISO
test -n "$XOR" && xorriso="$XOR" && XOR=
test -n "$RELENG_XORRISO" && xorriso="$RELENG_XORRISO" && RELENG_XORRISO=
test -n "$IMG" && image_file="$IMG" && IMG=
test -n "$RELENG_WORKIMAGE" && image_file="$RELENG_WORKIMAGE" \
&& RELENG_WORKIMAGE=
# This is not $DIR, which would exist before and after the test,
# but a temporary directory which may not exist before.
test -n "$RELENG_WORKDIR" && on_disk="$RELENG_WORKDIR" && RELENG_WORKDIR=
test -n "$RELENG_ISODIR" && in_iso="$RELENG_ISODIR" && RELENG_ISODIR=
@ -118,13 +109,13 @@ done
test -z "$in_iso" && in_iso="$on_disk"
if test -d ./tmp
if test -d ./releng_generated_data
then
dummy=dummy
else
echo "=== TEST ENVIRONMENT ERROR: $prog : No ./tmp directory existing" >&2
echo "=== TEST ENVIRONMENT ERROR: $prog : No ./releng_generated_data directory existing" >&2
echo "=== Is the current working directory really ./releng of libisoburn ?" >&2
echo "FAIL : $prog : Test environment error : No ./tmp directory"
echo "FAIL : $prog : Test environment error : No ./releng_generated_data directory"
exit 3
fi
if test -e "$workdir"

Loading…
Cancel
Save