[oe-commits] [openembedded-core] 32/39: selftest/sstatetests: Replace glibc-initial with linux-libc-headers

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit f0222760c04fab5d04b183bf4ca975cc90d13958
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Apr 7 15:26:30 2017 +0100

    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 at linuxfoundation.org>
---
 meta/lib/oeqa/selftest/sstatetests.py | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py
index 5814815..e35ddff 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)
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.