[libvirt] [PATCH] fix 7 "make check" test failures in non-srcdir build

Jim Meyering jim at meyering.net
Sat Jan 9 08:34:15 UTC 2010


FYI, I've already pushed this.
When I ran "make distcheck" (or just a non-srcdir "make check"),
I'd get 7 failures.  These were introduced by a change back in October.


>From e6abf3d8f2a60249955c4d59e7b994a99faf8ace Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Sat, 9 Jan 2010 08:37:22 +0100
Subject: [PATCH] fix 7 "make check" test failures in non-srcdir build

* tests/capabilityschematest: Define and use $srcdir.
* tests/domainschematest: Likewise.
* tests/interfaceschematest: Likewise.
* tests/networkschematest: Likewise.
* tests/nodedevschematest: Likewise.
* tests/storagepoolschematest: Likewise.
* tests/storagevolschematest: Likewise.
---
 tests/capabilityschematest  |    3 ++-
 tests/domainschematest      |    3 ++-
 tests/interfaceschematest   |    3 ++-
 tests/networkschematest     |    3 ++-
 tests/nodedevschematest     |    3 ++-
 tests/storagepoolschematest |    3 ++-
 tests/storagevolschematest  |    3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/capabilityschematest b/tests/capabilityschematest
index 3a1acc5..482dfe3 100755
--- a/tests/capabilityschematest
+++ b/tests/capabilityschematest
@@ -1,6 +1,7 @@
 #!/bin/sh

-. ./schematestutils.sh
+: ${srcdir=.}
+. $srcdir/schematestutils.sh

 DIRS="capabilityschemadata xencapsdata"
 SCHEMA="capability.rng"
diff --git a/tests/domainschematest b/tests/domainschematest
index 28ee69a..27a93cf 100755
--- a/tests/domainschematest
+++ b/tests/domainschematest
@@ -1,6 +1,7 @@
 #!/bin/sh

-. ./schematestutils.sh
+: ${srcdir=.}
+. $srcdir/schematestutils.sh

 DIRS="domainschemadata qemuxml2argvdata sexpr2xmldata xmconfigdata xml2sexprdata"
 SCHEMA="domain.rng"
diff --git a/tests/interfaceschematest b/tests/interfaceschematest
index e9ec2a4..8e9f6ee 100755
--- a/tests/interfaceschematest
+++ b/tests/interfaceschematest
@@ -1,6 +1,7 @@
 #!/bin/sh

-. ./schematestutils.sh
+: ${srcdir=.}
+. $srcdir/schematestutils.sh

 DIRS="interfaceschemadata"
 SCHEMA="interface.rng"
diff --git a/tests/networkschematest b/tests/networkschematest
index 01b2e6f..7210055 100755
--- a/tests/networkschematest
+++ b/tests/networkschematest
@@ -1,6 +1,7 @@
 #!/bin/sh

-. ./schematestutils.sh
+: ${srcdir=.}
+. $srcdir/schematestutils.sh

 DIRS="../src/network networkxml2xmlin networkxml2xmlout"
 SCHEMA="network.rng"
diff --git a/tests/nodedevschematest b/tests/nodedevschematest
index 2f0e2b9..3f0f03f 100755
--- a/tests/nodedevschematest
+++ b/tests/nodedevschematest
@@ -1,6 +1,7 @@
 #!/bin/sh

-. ./schematestutils.sh
+: ${srcdir=.}
+. $srcdir/schematestutils.sh

 DIRS="nodedevschemadata"
 SCHEMA="nodedev.rng"
diff --git a/tests/storagepoolschematest b/tests/storagepoolschematest
index 57b2f7b..9aef382 100755
--- a/tests/storagepoolschematest
+++ b/tests/storagepoolschematest
@@ -1,6 +1,7 @@
 #!/bin/sh

-. ./schematestutils.sh
+: ${srcdir=.}
+. $srcdir/schematestutils.sh

 DIRS="storagepoolxml2xmlin storagepoolxml2xmlout"
 SCHEMA="storagepool.rng"
diff --git a/tests/storagevolschematest b/tests/storagevolschematest
index 32a8657..74b6203 100755
--- a/tests/storagevolschematest
+++ b/tests/storagevolschematest
@@ -1,6 +1,7 @@
 #!/bin/sh

-. ./schematestutils.sh
+: ${srcdir=.}
+. $srcdir/schematestutils.sh

 DIRS="storagevolxml2xmlin storagevolxml2xmlout"
 SCHEMA="storagevol.rng"
--
1.6.6.439.gaf68f




More information about the libvir-list mailing list