From: Jim Meyering <meyering@redhat.com>
Date: Sat, 9 Jan 2010 07:37:22 +0000 (+0100)
Subject: fix 7 "make check" test failures in non-srcdir build
X-Git-Tag: v0.7.6~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6abf3d8f2a60249955c4d59e7b994a99faf8ace;p=thirdparty%2Flibvirt.git

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

diff --git a/tests/capabilityschematest b/tests/capabilityschematest
index 3a1acc5aaa..482dfe305e 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 28ee69ac1b..27a93cf86c 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 e9ec2a47d5..8e9f6ee21c 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 01b2e6f20d..72100551a7 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 2f0e2b9a88..3f0f03f9a5 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 57b2f7bbde..9aef38298b 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 32a86578a4..74b62030be 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"