mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Consistent use of $(top_builddir)/run --test when building test guests.

Browse Source
This commit is contained in:
Richard W.M. Jones
2012-07-26 22:00:07 +01:00
parent 590774ed9e
commit dcc0ebc8e0
4 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/guests/Makefile.am
View File

@@ -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.

2
tests/guests/guest-aux/make-debian-img.sh
View File

@@ -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

2
tests/guests/guest-aux/make-ubuntu-img.sh
View File

@@ -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

4
tests/guests/guest-aux/make-windows-img.sh
View File

@@ -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