]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/runtime/opkg: Ensure the test works on multilib
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 11 Oct 2018 19:05:35 +0000 (20:05 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 11 Oct 2018 22:06:29 +0000 (23:06 +0100)
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>
meta/lib/oeqa/runtime/cases/opkg.py

index 671ee06c73e75b5744c32f559acac2c4a5244b60..50de8001c36e0f4641996891e231f0e9a1732a06 100644 (file)
@@ -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()