diff options
| author | Richard Jones <rjones@debian5x64.home.annexia.org> | 2009-08-19 15:09:27 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-08-19 15:13:51 +0100 |
| commit | 2f3a0e3975ddecce2330324a152530c5b99f22f9 (patch) | |
| tree | 87dfa9759a524acaeaef1022e1564badc5f9db20 /images | |
| parent | 2b891ceef355ce2d6532d65f8febbe3833d4399e (diff) | |
| download | libguestfs-2f3a0e3975ddecce2330324a152530c5b99f22f9.tar.gz libguestfs-2f3a0e3975ddecce2330324a152530c5b99f22f9.tar.xz libguestfs-2f3a0e3975ddecce2330324a152530c5b99f22f9.zip | |
tests: Use ISO instead of squashfs.
The squashfs format changes too much. Use an ISO file for
the tests instead.
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile.am | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/images/Makefile.am b/images/Makefile.am index 3c30df5a..ff6bc5d5 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -35,14 +35,14 @@ EXTRA_DIST = \ lib-x86_64.so \ test-grep.txt -noinst_DATA = test.sqsh +noinst_DATA = test.iso CLEANFILES = \ - test.sqsh \ + test.iso test.sqsh \ 100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \ initrd -squash_files_src = \ +images_files_src = \ $(srcdir)/helloworld.tar \ $(srcdir)/helloworld.tar.gz \ $(srcdir)/empty \ @@ -63,7 +63,7 @@ squash_files_src = \ $(srcdir)/lib-x86_64.so \ $(srcdir)/test-grep.txt -squash_files_build = \ +images_files_build = \ $(builddir)/100kallzeroes \ $(builddir)/100kallnewlines \ $(builddir)/100kallspaces \ @@ -74,12 +74,14 @@ squash_files_build = \ $(builddir)/initrd-x86_64.img.gz \ $(builddir)/test-grep.txt.gz -squash_files = $(squash_files_src) $(squash_files_build) +images_files = $(images_files_src) $(images_files_build) -test.sqsh: $(squash_files) +test.iso: $(images_files) rm -f $@ $@-t mkdir -p directory - $(MKSQUASHFS) $(squash_files) directory $@-t + $(MKISOFS) -J -r -graft-points \ + -o $@-t \ + $(images_files) /directory=directory rmdir directory mv $@-t $@ |