[oe-commits] Stefan Stanacar : oeqa/runtime: rpm: fix finding the test rpm file
git at git.openembedded.org
git at git.openembedded.org
Sun Feb 2 11:26:01 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: fd0e9ad4d295ca11b33c3e3e11069421dee834e8
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fd0e9ad4d295ca11b33c3e3e11069421dee834e8
Author: Stefan Stanacar <stefanx.stanacar at intel.com>
Date: Tue Jan 28 18:14:18 2014 +0200
oeqa/runtime: rpm: fix finding the test rpm file
Translate TUNE_PKGARCH to find the right file (this
used to work because tune for qemux86-64 used to be
x86_64 now it's core2-64)
Also, while using packagedata was nice, it's harder to make
the test exportable and runnable outside of the
build system. (where oe.packagedata isn't available)
Signed-off-by: Stefan Stanacar <stefanx.stanacar at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oeqa/runtime/rpm.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/runtime/rpm.py b/meta/lib/oeqa/runtime/rpm.py
index 154cad5..084d22f 100644
--- a/meta/lib/oeqa/runtime/rpm.py
+++ b/meta/lib/oeqa/runtime/rpm.py
@@ -1,8 +1,8 @@
import unittest
import os
+import fnmatch
from oeqa.oetest import oeRuntimeTest, skipModule
from oeqa.utils.decorators import *
-import oe.packagedata
def setUpModule():
if not oeRuntimeTest.hasFeature("package-management"):
@@ -27,11 +27,12 @@ class RpmInstallRemoveTest(oeRuntimeTest):
@classmethod
def setUpClass(self):
- deploydir = os.path.join(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR', True), "rpm", oeRuntimeTest.tc.d.getVar('TUNE_PKGARCH', True))
- pkgdata = oe.packagedata.read_subpkgdata("rpm-doc", oeRuntimeTest.tc.d)
+ pkgarch = oeRuntimeTest.tc.d.getVar('TUNE_PKGARCH', True).replace("-", "_")
+ rpmdir = os.path.join(oeRuntimeTest.tc.d.getVar('DEPLOY_DIR', True), "rpm", pkgarch)
# pick rpm-doc as a test file to get installed, because it's small and it will always be built for standard targets
- testrpmfile = "rpm-doc-%s-%s.%s.rpm" % (pkgdata["PKGV"], pkgdata["PKGR"], oeRuntimeTest.tc.d.getVar('TUNE_PKGARCH', True))
- oeRuntimeTest.tc.target.copy_to(os.path.join(deploydir,testrpmfile), "/tmp/rpm-doc.rpm")
+ for f in fnmatch.filter(os.listdir(rpmdir), "rpm-doc-*.%s.rpm" % pkgarch):
+ testrpmfile = f
+ oeRuntimeTest.tc.target.copy_to(os.path.join(rpmdir,testrpmfile), "/tmp/rpm-doc.rpm")
@skipUnlessPassed('test_rpm_help')
def test_rpm_install(self):
More information about the Openembedded-commits
mailing list