From 70a30d9770cb2e9bc0dea4293d5957efe22ea86e Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Mon, 23 Jan 2017 14:41:32 -0600 Subject: selftest: sstatetests: skip glibc-initial tests in case of non-glibc distro Some distros uses non-glibc so skip those tests requiring glibc-initial as target (From OE-Core rev: 41f02cb7307faec32b13733e41f78a0ebdc1b52b) Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/sstatetests.py | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'meta/lib/oeqa/selftest/sstatetests.py') diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index 6642539ebf..e3f819c634 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py @@ -51,12 +51,15 @@ class SStateTests(SStateBase): @testcase(976) def test_sstate_creation_distro_nonspecific_pass(self): - self.run_test_sstate_creation(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) + # glibc-initial is intended only for the glibc C library + if self.tclibc == 'glibc': + self.run_test_sstate_creation(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1375) def test_sstate_creation_distro_nonspecific_fail(self): - self.run_test_sstate_creation(['glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) - + # glibc-initial is intended only for the glibc C library + if self.tclibc == 'glibc': + self.run_test_sstate_creation(['glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) # Test the sstate files deletion part of the do_cleansstate task def run_test_cleansstate_task(self, targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True): @@ -78,16 +81,26 @@ class SStateTests(SStateBase): @testcase(977) def test_cleansstate_task_distro_specific_nonspecific(self): targetarch = get_bb_var('TUNE_ARCH') - self.run_test_cleansstate_task(['binutils-cross-' + targetarch, 'binutils-native', 'glibc-initial'], distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) + targets = ['binutils-cross-'+ targetarch, 'binutils-native'] + # glibc-initial is intended only for the glibc C library + if self.tclibc == 'glibc': + targets.append('glibc-initial') + self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) @testcase(1376) def test_cleansstate_task_distro_nonspecific(self): - self.run_test_cleansstate_task(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) + # glibc-initial is intended only for the glibc C library + if self.tclibc == 'glibc': + self.run_test_cleansstate_task(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1377) def test_cleansstate_task_distro_specific(self): targetarch = get_bb_var('TUNE_ARCH') - self.run_test_cleansstate_task(['binutils-cross-'+ targetarch, 'binutils-native', 'glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) + targets = ['binutils-cross-'+ targetarch, 'binutils-native'] + # glibc-initial is intended only for the glibc C library + if self.tclibc == 'glibc': + targets.append('glibc-initial') + self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) # Test rebuilding of distro-specific sstate files -- cgit v1.2.3-54-g00ecf