From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 11 Oct 2018 19:05:35 +0000 (+0100)
Subject: oeqa/runtime/opkg: Ensure the test works on multilib
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~16439
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f692d86c2c6742c67aba93fa24b930af02d8e85;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

oeqa/runtime/opkg: Ensure the test works on multilib

After allarch was disabled in multilib, this test broke. Fix the test to account
for that change.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/runtime/cases/opkg.py b/meta/lib/oeqa/runtime/cases/opkg.py
index 671ee06c73e..50de8001c36 100644
--- a/meta/lib/oeqa/runtime/cases/opkg.py
+++ b/meta/lib/oeqa/runtime/cases/opkg.py
@@ -17,7 +17,10 @@ class OpkgRepoTest(OpkgTest):
 
     @classmethod
     def setUpClass(cls):
-        service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_IPK'], 'all')
+        allarchfeed = 'all'
+        if cls.tc.td["MULTILIB_VARIANTS"]:
+            allarchfeed = cls.tc.td["TUNE_PKGARCH"]
+        service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_IPK'], allarchfeed)
         cls.repo_server = HTTPService(service_repo, cls.tc.target.server_ip)
         cls.repo_server.start()