Skip to contentSkip to conversation

Add lzip test instead of iptables for runtime

PATCH New [email protected] 1 participant 3 messages Jul 6, 2017

lore
Share & tools
lore
#0 lore raw

cover Add lzip test instead of iptables for runtime

From: Jose Perez Carranza <[email protected]>

This series is created to replace iptables tests for lzip test and avoid conflicts with images built with “musl”. A two separate patches were sent before related to this, one for SDK [1] and other one to add changes to testimage.bbclass[2], the second one itself doe not works, hence in this series the second patch is included and also the complement fully apply the test on runtime.

Patch [1] is still applicable and does not conflicts with this series.

1- https://patchwork.openembedded.org/patch/141496/
2- https://patchwork.openembedded.org/patch/141620/

The following changes since commit 754c03006943a219ffd417c36ab909b464f57f67:

local.conf.sample: drop image-swab reference (2017-07-06 15:03:10 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib jperez/bug11713
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jperez/bug11713

Jose Perez Carranza (1):
oeqa/runtime: Replace buildiptables for buildlzip on runtime tests

Khem Raj (1):
testimage: Use the renamed buildlzip

 meta/classes/testimage.bbclass                                 | 6 +++---
 meta/lib/oeqa/runtime/cases/{buildiptables.py => buildlzip.py} | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/lib/oeqa/runtime/cases/{buildiptables.py => buildlzip.py} (89%)
Signature · 1 line
2.12.0
#1 lore raw

PATCH 1/2 oeqa/runtime: Replace buildiptables for buildlzip on runtime tests

From: Jose Perez Carranza <[email protected]>

Buildiptables test cases are conflicting with images built with “musl” as standard C library, in order to avoid those issues lzip package was selected to be used on the tests as this does not have any "musl" dependency.

This patch is applicable for testimage tests

[YOCTO # 11713]

---
 meta/lib/oeqa/runtime/cases/{buildiptables.py => buildlzip.py} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/lib/oeqa/runtime/cases/{buildiptables.py => buildlzip.py} (89%)
meta/lib/oeqa/runtime/cases/buildlzip.py renamed from meta/lib/oeqa/runtime/cases/buildiptables.py +3 -3
similarity index 89%
rename from meta/lib/oeqa/runtime/cases/buildiptables.py
rename to meta/lib/oeqa/runtime/cases/buildlzip.py
index 002b16c4835..ca3fead2e49 100644
@@ -5,12 +5,12 @@ from oeqa.core.decorator.data import skipIfNotFeature
 
 from oeqa.runtime.utils.targetbuildproject import TargetBuildProject
 
-class BuildIptablesTest(OERuntimeTestCase):
+class BuildLzipTest(OERuntimeTestCase):
 
     @classmethod
     def setUpClass(cls):
         uri = 'http://downloads.yoctoproject.org/mirror/sources'
-        uri = '%s/iptables-1.4.13.tar.bz2' % uri
+        uri = '%s/lzip-1.19.tar.gz' % uri
         cls.project = TargetBuildProject(cls.tc.target,
                                          uri,
                                          dl_dir = cls.tc.td['DL_DIR'])
@@ -24,7 +24,7 @@ class BuildIptablesTest(OERuntimeTestCase):
     @skipIfNotFeature('tools-sdk',
                       'Test requires tools-sdk to be in IMAGE_FEATURES')
     @OETestDepends(['ssh.SSHTest.test_ssh'])
-    def test_iptables(self):
+    def test_lzip(self):
         self.project.run_configure()
         self.project.run_make()
         self.project.run_install()
Signature · 1 line
2.12.0
#2 lore raw

PATCH 2/2 testimage: Use the renamed buildlzip

In reply to [email protected]

From: Khem Raj <[email protected]>

buildiptables has been replaced with buildlzip

---
 meta/classes/testimage.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/classes/testimage.bbclass +3 -3
index 6fa2d6fd9f4..0c4a84e1119 100644
@@ -49,10 +49,10 @@ DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs ${RPMTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg parselogs ${RPMTESTSUITE} \
     ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)}"
-DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} buildcpio buildiptables buildgalculator \
+DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} buildcpio buildlzip buildgalculator \
     connman ${DEVTESTSUITE} logrotate perl parselogs python ${RPMTESTSUITE} xorg"
 DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python parselogs ${RPMTESTSUITE}"
-DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcpio buildiptables buildgalculator \
+DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcpio buildlzip buildgalculator \
     connman ${DEVTESTSUITE} logrotate pam parselogs perl python ${RPMTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
 
@@ -61,7 +61,7 @@ DEFAULT_TEST_SUITES_remove_aarch64 = "xorg"
 
 # qemumips is quite slow and has reached the timeout limit several times on the YP build cluster,
 # mitigate this by removing build tests for qemumips machines.
-MIPSREMOVE ??= "buildcpio buildiptables buildgalculator"
+MIPSREMOVE ??= "buildcpio buildlzip buildgalculator"
 DEFAULT_TEST_SUITES_remove_qemumips = "${MIPSREMOVE}"
 DEFAULT_TEST_SUITES_remove_qemumips64 = "${MIPSREMOVE}"
 
Signature · 1 line
2.12.0