tests: Don't use relative paths to binaries in tests.

All tests run under the ./run binary.  For a long time the ./run
binary has set the $PATH environment variable to contain all of the
directories with binaries in them.

Therefore there is no reason to use ../fish/guestfish instead of just
plain guestfish (and the same applies to other built binaries).
This commit is contained in:
Richard W.M. Jones
2014-09-15 15:17:47 +01:00
parent bced8f5289
commit e85a976c5a
119 changed files with 323 additions and 346 deletions

View File

@@ -26,15 +26,13 @@ if [ -n "$SKIP_TEST_INSPECT_FSTAB_MD_SH" ]; then
exit 77
fi
guestfish=../../fish/guestfish
rm -f inspect-fstab-md-{1,2}.img inspect-fstab-md.fstab inspect-fstab-md.output
# First, test the regular fedora image, which specifies /boot as /dev/md0
cp ../guests/fedora-md1.img inspect-fstab-md-1.img
cp ../guests/fedora-md2.img inspect-fstab-md-2.img
$guestfish -i inspect-fstab-md-[12].img <<'EOF' | sort > inspect-fstab-md.output
guestfish -i inspect-fstab-md-[12].img <<'EOF' | sort > inspect-fstab-md.output
exists /boot/grub/grub.conf
EOF
@@ -49,13 +47,13 @@ cat <<'EOF' > inspect-fstab-md.fstab
/dev/md/boot /boot ext2 default 0 0
EOF
$guestfish -a inspect-fstab-md-1.img -a inspect-fstab-md-2.img <<'EOF'
guestfish -a inspect-fstab-md-1.img -a inspect-fstab-md-2.img <<'EOF'
run
mount /dev/VG/Root /
upload inspect-fstab-md.fstab /etc/fstab
EOF
$guestfish -i inspect-fstab-md-[12].img <<'EOF' | sort > inspect-fstab-md.output
guestfish -i inspect-fstab-md-[12].img <<'EOF' | sort > inspect-fstab-md.output
exists /boot/grub/grub.conf
EOF