[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] build: distribute missing file



2010/5/20 Eric Blake <eblake redhat com>:
> Commit f30ccb2458829 was incomplete.
>
> * .gitignore: Ignore intermediate directory during failed 'make
> distcheck'.
> * tests/Makefile.am (qemuhelpdata): Distribute new file.
> ---
>
> Pushing as obvious, once a successful 'make distcheck' completes
> a few minutes from when I write this.
>

> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index b5e09e3..c5e52e3 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -46,7 +46,8 @@ qemuhelpdata = \
>        qemu-0.10.5 \
>        qemu-0.12.1 \
>        qemu-kvm-0.10.5 \
> -       qemu-kvm-0.11.0-rc2
> +       qemu-kvm-0.11.0-rc2 \
> +       qemu-kvm-0.12.3
>
>  EXTRA_DIST =           \
>         oomtrace.pl     \
> --
> 1.7.0.1

Maybe we should just apply this patch instead and distribute the
qemuhelpdata directory content like every other directory in the tests
directory. Or is there any special reason for treating qemuhelpdata
differently, making it more error prone?


diff --git a/tests/Makefile.am b/tests/Makefile.am
index b5e09e3..802a62f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -39,15 +39,6 @@ LDADDS = \
 	$(LIBSOCKET) \
         $(COVERAGE_LDFLAGS)

-qemuhelpdata = \
-	kvm-74 \
-	kvm-86 \
-	qemu-0.9.1 \
-	qemu-0.10.5 \
-	qemu-0.12.1 \
-	qemu-kvm-0.10.5 \
-	qemu-kvm-0.11.0-rc2
-
 EXTRA_DIST =		\
         oomtrace.pl     \
 	test-lib.sh	\
@@ -75,7 +66,7 @@ EXTRA_DIST =		\
 	nwfilterxml2xmlout \
 	nwfilterxml2xmlin \
 	nwfilterschematest \
-	$(patsubst %,qemuhelpdata/%,$(qemuhelpdata))
+	qemuhelpdata

 noinst_PROGRAMS = virshtest conftest \
         nodeinfotest statstest qparamtest


Matthias


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]