summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-07-26 22:00:07 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-07-26 22:02:07 +0100
commitdcc0ebc8e0c4a8abd505421a584573272a03f7aa (patch)
tree726b81b5d14c3f2eeaccabae785339c4c6a46ac1
parent590774ed9e005dc85ca6851939e76d02da6624c8 (diff)
downloadlibguestfs-dcc0ebc8e0c4a8abd505421a584573272a03f7aa.tar.gz
libguestfs-dcc0ebc8e0c4a8abd505421a584573272a03f7aa.tar.xz
libguestfs-dcc0ebc8e0c4a8abd505421a584573272a03f7aa.zip
tests: Consistent use of $(top_builddir)/run --test when building test guests.
-rw-r--r--tests/guests/Makefile.am22
-rwxr-xr-xtests/guests/guest-aux/make-debian-img.sh2
-rwxr-xr-xtests/guests/guest-aux/make-ubuntu-img.sh2
-rwxr-xr-xtests/guests/guest-aux/make-windows-img.sh4
4 files changed, 9 insertions, 21 deletions
diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am
index 21311dea..a05dceb8 100644
--- a/tests/guests/Makefile.am
+++ b/tests/guests/Makefile.am
@@ -46,10 +46,7 @@ CLEANFILES = $(check_DATA) stamp-fedora-md.img *.tmp.*
fedora.img: guest-aux/make-fedora-img.pl \
guest-aux/fedora-name.db \
guest-aux/fedora-packages.db
- TMPDIR=$(top_builddir) \
- SRCDIR=$(srcdir) \
- LAYOUT=partitions \
- $(top_builddir)/run --test $<
+ SRCDIR=$(srcdir) LAYOUT=partitions $(top_builddir)/run --test $<
# Make a (dummy) Fedora image using md devices
fedora-md1.img fedora-md2.img: stamp-fedora-md.img
@@ -58,10 +55,7 @@ stamp-fedora-md.img: guest-aux/make-fedora-img.pl \
guest-aux/fedora-name.db \
guest-aux/fedora-packages.db
rm -f $@
- TMPDIR=$(top_builddir) \
- SRCDIR=$(srcdir) \
- LAYOUT=partitions-md \
- $(top_builddir)/run --test $<
+ SRCDIR=$(srcdir) LAYOUT=partitions-md $(top_builddir)/run --test $<
touch $@
guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
@@ -78,22 +72,16 @@ guest-aux/fedora-packages.db: guest-aux/fedora-packages.db.txt
# Make a (dummy) Debian image.
debian.img: guest-aux/make-debian-img.sh
- TMPDIR=$(top_builddir) \
- SRCDIR=$(srcdir) \
- bash $<
+ SRCDIR=$(srcdir) $(top_builddir)/run --test $<
# Make a (dummy) Ubuntu image.
ubuntu.img: guest-aux/make-ubuntu-img.sh
- TMPDIR=$(top_builddir) \
- SRCDIR=$(srcdir) \
- bash $<
+ SRCDIR=$(srcdir) $(top_builddir)/run --test $<
# Make a (dummy) Windows image.
windows.img: guest-aux/make-windows-img.sh \
guest-aux/windows-software guest-aux/windows-system
- TMPDIR=$(top_builddir) \
- SRCDIR=$(srcdir) \
- bash $<
+ SRCDIR=$(srcdir) $(top_builddir)/run --test $<
# Since users might not have the tools needed to create this, we
# also distribute these files.
diff --git a/tests/guests/guest-aux/make-debian-img.sh b/tests/guests/guest-aux/make-debian-img.sh
index 00a68d5a..74e9f59c 100755
--- a/tests/guests/guest-aux/make-debian-img.sh
+++ b/tests/guests/guest-aux/make-debian-img.sh
@@ -31,7 +31,7 @@ LABEL=BOOT /boot ext2 default 0 0
EOF
# Create a disk image.
-../../run ../../fish/guestfish <<EOF
+../../fish/guestfish <<EOF
sparse debian.img.tmp.$$ 512M
run
diff --git a/tests/guests/guest-aux/make-ubuntu-img.sh b/tests/guests/guest-aux/make-ubuntu-img.sh
index 7a583198..50bae439 100755
--- a/tests/guests/guest-aux/make-ubuntu-img.sh
+++ b/tests/guests/guest-aux/make-ubuntu-img.sh
@@ -39,7 +39,7 @@ DISTRIB_DESCRIPTION="Ubuntu 10.10 (Phony Pharaoh)"
EOF
# Create a disk image.
-../../run ../../fish/guestfish <<EOF
+../../fish/guestfish <<EOF
sparse ubuntu.img.tmp.$$ 512M
run
diff --git a/tests/guests/guest-aux/make-windows-img.sh b/tests/guests/guest-aux/make-windows-img.sh
index 89a305cd..521fde2c 100755
--- a/tests/guests/guest-aux/make-windows-img.sh
+++ b/tests/guests/guest-aux/make-windows-img.sh
@@ -25,7 +25,7 @@ set -e
# ntfs-3g/ntfsprogs then we cannot create a Windows phony image.
# Nothing actually uses windows.img in the standard build so we can
# just 'touch' it and emit a warning.
-if ! ../../run ../../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; then
+if ! ../../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; then
echo "***"
echo "Warning: cannot create windows.img because there is no NTFS"
echo "support in this build of libguestfs. Just touching the output"
@@ -36,7 +36,7 @@ if ! ../../run ../../fish/guestfish -a /dev/null run : available "ntfs3g ntfspro
fi
# Create a disk image.
-../../run ../../fish/guestfish <<EOF
+../../fish/guestfish <<EOF
sparse windows.img.tmp.$$ 512M
run