4:53 a.m.
This fixes another "make distcheck" (or non-srcdir) build failure:
From f9523d014a590fb881c14397f8c3869f328d023c Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 8 Jul 2009 08:35:24 +0200
Subject: [PATCH 3/4] fix another failing "make distcheck" (qemuhelptest)
It failed in a non-srcdir build because those 5 sample output
files were not included in the distribution tarball. Include them.
* tests/Makefile.am (qemuhelpdata, EXTRA_DIST): Include these:
kvm-74, kvm-86, qemu-0.10.5, qemu-0.9.1, qemu-kvm-0.10.5.
---
tests/Makefile.am | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3d98d69..f8bde34 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,6 +36,13 @@ LDADDS = \
$(LIBSOCKET) \
$(COVERAGE_LDFLAGS)
+qemuhelpdata = \
+ kvm-74 \
+ kvm-86 \
+ qemu-0.10.5 \
+ qemu-0.9.1 \
+ qemu-kvm-0.10.5
+
EXTRA_DIST = \
oomtrace.pl \
test-lib.sh \
@@ -51,7 +58,8 @@ EXTRA_DIST = \
storagevolschematest \
storagevolschemadata \
nodedevschematest \
- nodedevschemadata
+ nodedevschemadata \
+ $(patsubst %,qemuhelpdata/%,$(qemuhelpdata))
noinst_PROGRAMS = virshtest conftest \
nodeinfotest statstest qparamtest
--
1.6.3.3.524.g8586b
5:23 a.m.
On Wed, Jul 08, 2009 at 11:53:58AM +0200, Jim Meyering wrote:
This fixes another "make distcheck" (or non-srcdir) build
failure:
>From f9523d014a590fb881c14397f8c3869f328d023c Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 8 Jul 2009 08:35:24 +0200
Subject: [PATCH 3/4] fix another failing "make distcheck" (qemuhelptest)
It failed in a non-srcdir build because those 5 sample output
files were not included in the distribution tarball. Include them.
* tests/Makefile.am (qemuhelpdata, EXTRA_DIST): Include these:
kvm-74, kvm-86, qemu-0.10.5, qemu-0.9.1, qemu-kvm-0.10.5.
---
tests/Makefile.am | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
ACK
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
6:14 a.m.
On Wed, Jul 08, 2009 at 11:53:58AM +0200, Jim Meyering wrote:
This fixes another "make distcheck" (or non-srcdir) build
failure:
>From f9523d014a590fb881c14397f8c3869f328d023c Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 8 Jul 2009 08:35:24 +0200
Subject: [PATCH 3/4] fix another failing "make distcheck" (qemuhelptest)
It failed in a non-srcdir build because those 5 sample output
files were not included in the distribution tarball. Include them.
* tests/Makefile.am (qemuhelpdata, EXTRA_DIST): Include these:
kvm-74, kvm-86, qemu-0.10.5, qemu-0.9.1, qemu-kvm-0.10.5.
---
tests/Makefile.am | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
[...]
+ nodedevschemadata \
+ $(patsubst %,qemuhelpdata/%,$(qemuhelpdata))
Sounds good, but hum, that is cryptic !
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
9:09 a.m.
Daniel Veillard wrote:
On Wed, Jul 08, 2009 at 11:53:58AM +0200, Jim Meyering wrote:
> This fixes another "make distcheck" (or non-srcdir) build failure:
>
> >From f9523d014a590fb881c14397f8c3869f328d023c Mon Sep 17 00:00:00 2001
> From: Jim Meyering <meyering(a)redhat.com>
> Date: Wed, 8 Jul 2009 08:35:24 +0200
> Subject: [PATCH 3/4] fix another failing "make distcheck" (qemuhelptest)
>
> It failed in a non-srcdir build because those 5 sample output
> files were not included in the distribution tarball. Include them.
> * tests/Makefile.am (qemuhelpdata, EXTRA_DIST): Include these:
> kvm-74, kvm-86, qemu-0.10.5, qemu-0.9.1, qemu-kvm-0.10.5.
> ---
> tests/Makefile.am | 10 +++++++++-
> 1 files changed, 9 insertions(+), 1 deletions(-)
[...]
> + nodedevschemadata \
> + $(patsubst %,qemuhelpdata/%,$(qemuhelpdata))
Sounds good, but hum, that is cryptic !
Pushed.
It's a GNU make idiom to factor out the repeated qemuhelpdata/ prefix.
The following is equivalent.
If you'd like, I can commit this patch, too.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f8bde34..4f2520b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,13 +36,6 @@ LDADDS = \
$(LIBSOCKET) \
$(COVERAGE_LDFLAGS)
-qemuhelpdata = \
- kvm-74 \
- kvm-86 \
- qemu-0.10.5 \
- qemu-0.9.1 \
- qemu-kvm-0.10.5
-
EXTRA_DIST = \
oomtrace.pl \
test-lib.sh \
@@ -59,7 +52,11 @@ EXTRA_DIST = \
storagevolschemadata \
nodedevschematest \
nodedevschemadata \
- $(patsubst %,qemuhelpdata/%,$(qemuhelpdata))
+ qemuhelpdata/kvm-74 \
+ qemuhelpdata/kvm-86 \
+ qemuhelpdata/qemu-0.10.5 \
+ qemuhelpdata/qemu-0.9.1 \
+ qemuhelpdata/qemu-kvm-0.10.5
noinst_PROGRAMS = virshtest conftest \
nodeinfotest statstest qparamtest
9:53 a.m.
On Wed, Jul 08, 2009 at 04:09:10PM +0200, Jim Meyering wrote:
Daniel Veillard wrote:
> On Wed, Jul 08, 2009 at 11:53:58AM +0200, Jim Meyering wrote:
>> + nodedevschemadata \
>> + $(patsubst %,qemuhelpdata/%,$(qemuhelpdata))
>
> Sounds good, but hum, that is cryptic !
Pushed.
It's a GNU make idiom to factor out the repeated qemuhelpdata/ prefix.
The following is equivalent.
If you'd like, I can commit this patch, too.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f8bde34..4f2520b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,13 +36,6 @@ LDADDS = \
$(LIBSOCKET) \
$(COVERAGE_LDFLAGS)
-qemuhelpdata = \
- kvm-74 \
- kvm-86 \
- qemu-0.10.5 \
- qemu-0.9.1 \
- qemu-kvm-0.10.5
-
EXTRA_DIST = \
oomtrace.pl \
test-lib.sh \
@@ -59,7 +52,11 @@ EXTRA_DIST = \
storagevolschemadata \
nodedevschematest \
nodedevschemadata \
- $(patsubst %,qemuhelpdata/%,$(qemuhelpdata))
+ qemuhelpdata/kvm-74 \
+ qemuhelpdata/kvm-86 \
+ qemuhelpdata/qemu-0.10.5 \
+ qemuhelpdata/qemu-0.9.1 \
+ qemuhelpdata/qemu-kvm-0.10.5
okay, that's clearer but less useful :-) so keep it that way
thanks !
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
5616
days inactive
5616
days old
4 comments
3 participants
participants (3)
-
Daniel P. Berrange -
Daniel Veillard -
Jim Meyering