aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-07 15:26:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-08 22:48:07 +0100
commitc37d610272f9d0a506334ff9f724c025acace137 (patch)
treea5bf39f25f06a59bbd3940cf2dd06f9652b44d52
parent767335c92b7cc657a008722a908380a3c89c3c66 (diff)
downloadopenembedded-core-contrib-c37d610272f9d0a506334ff9f724c025acace137.tar.gz
openembedded-core-contrib-c37d610272f9d0a506334ff9f724c025acace137.tar.bz2
openembedded-core-contrib-c37d610272f9d0a506334ff9f724c025acace137.zip
selftest/sstatetests: Replace glibc-initial with linux-libc-headers
The intent in these tests was to find something early in the bootstrap process to run tests against which didn't require long build times. This breaks with the removal of the glibc-initial do_build target. Replacing it with linux-libc-headers seems like a good choice and simplifies the conditionals too. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/sstatetests.py20
1 files changed, 5 insertions, 15 deletions
diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py
index 5814815fe3..e35ddfff5f 100644
--- a/meta/lib/oeqa/selftest/sstatetests.py
+++ b/meta/lib/oeqa/selftest/sstatetests.py
@@ -49,15 +49,11 @@ class SStateTests(SStateBase):
@testcase(976)
def test_sstate_creation_distro_nonspecific_pass(self):
- # 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)
+ self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
@testcase(1375)
def test_sstate_creation_distro_nonspecific_fail(self):
- # 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)
+ self.run_test_sstate_creation(['linux-libc-headers'], 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):
@@ -79,23 +75,17 @@ class SStateTests(SStateBase):
@testcase(977)
def test_cleansstate_task_distro_specific_nonspecific(self):
targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native']
- # glibc-initial is intended only for the glibc C library
- if self.tclibc == 'glibc':
- targets.append('glibc-initial')
+ targets.append('linux-libc-headers')
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):
- # 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)
+ self.run_test_cleansstate_task(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
@testcase(1377)
def test_cleansstate_task_distro_specific(self):
targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native']
- # glibc-initial is intended only for the glibc C library
- if self.tclibc == 'glibc':
- targets.append('glibc-initial')
+ targets.append('linux-libc-headers')
self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True)