summaryrefslogtreecommitdiffstats
path: root/meta
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-10 23:00:44 +0100
commit90c1bb7569e3c38cf406d726edb8cc719e4df3fc (patch)
treec829f2a14b0cb2cd07d1a9304a838f70f097fda0 /meta
parent863b6d4f80869b0388fd9ef5c0ead38993c3b2b5 (diff)
downloadpoky-90c1bb7569e3c38cf406d726edb8cc719e4df3fc.tar.gz
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. (From OE-Core rev: c37d610272f9d0a506334ff9f724c025acace137) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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):
49 49
50 @testcase(976) 50 @testcase(976)
51 def test_sstate_creation_distro_nonspecific_pass(self): 51 def test_sstate_creation_distro_nonspecific_pass(self):
52 # glibc-initial is intended only for the glibc C library 52 self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
53 if self.tclibc == 'glibc':
54 self.run_test_sstate_creation(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
55 53
56 @testcase(1375) 54 @testcase(1375)
57 def test_sstate_creation_distro_nonspecific_fail(self): 55 def test_sstate_creation_distro_nonspecific_fail(self):
58 # glibc-initial is intended only for the glibc C library 56 self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False)
59 if self.tclibc == 'glibc':
60 self.run_test_sstate_creation(['glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False)
61 57
62 # Test the sstate files deletion part of the do_cleansstate task 58 # Test the sstate files deletion part of the do_cleansstate task
63 def run_test_cleansstate_task(self, targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True): 59 def run_test_cleansstate_task(self, targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True):
@@ -79,23 +75,17 @@ class SStateTests(SStateBase):
79 @testcase(977) 75 @testcase(977)
80 def test_cleansstate_task_distro_specific_nonspecific(self): 76 def test_cleansstate_task_distro_specific_nonspecific(self):
81 targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] 77 targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native']
82 # glibc-initial is intended only for the glibc C library 78 targets.append('linux-libc-headers')
83 if self.tclibc == 'glibc':
84 targets.append('glibc-initial')
85 self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) 79 self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True)
86 80
87 @testcase(1376) 81 @testcase(1376)
88 def test_cleansstate_task_distro_nonspecific(self): 82 def test_cleansstate_task_distro_nonspecific(self):
89 # glibc-initial is intended only for the glibc C library 83 self.run_test_cleansstate_task(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
90 if self.tclibc == 'glibc':
91 self.run_test_cleansstate_task(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
92 84
93 @testcase(1377) 85 @testcase(1377)
94 def test_cleansstate_task_distro_specific(self): 86 def test_cleansstate_task_distro_specific(self):
95 targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] 87 targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native']
96 # glibc-initial is intended only for the glibc C library 88 targets.append('linux-libc-headers')
97 if self.tclibc == 'glibc':
98 targets.append('glibc-initial')
99 self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) 89 self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True)
100 90
101 91