summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-04 09:29:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-04 09:29:23 +0100
commit5459af33b9b60a1b9c8cfe93a3f55b9fae3d6984 (patch)
treed700292ce985eac02e62024acdd9889006ad0565 /meta
parent530e66cb04508e361643609496da8b2b4f75e3bf (diff)
downloadpoky-5459af33b9b60a1b9c8cfe93a3f55b9fae3d6984.tar.gz
sstatetests: Update after binutils-cross name change with PN addition
(From OE-Core rev: c5230b459fb4ef486f657f5633b67ca925981f03) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/sstatetests.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py
index 35ff28b04a..7d12faaece 100644
--- a/meta/lib/oeqa/selftest/sstatetests.py
+++ b/meta/lib/oeqa/selftest/sstatetests.py
@@ -29,10 +29,12 @@ class SStateTests(SStateBase):
29 self.assertTrue(not file_tracker , msg="Found sstate files in the wrong place for: %s" % ', '.join(map(str, targets))) 29 self.assertTrue(not file_tracker , msg="Found sstate files in the wrong place for: %s" % ', '.join(map(str, targets)))
30 30
31 def test_sstate_creation_distro_specific_pass(self): 31 def test_sstate_creation_distro_specific_pass(self):
32 self.run_test_sstate_creation(['binutils-cross', 'binutils-native'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) 32 targetarch = get_bb_var('TARGET_ARCH')
33 self.run_test_sstate_creation(['binutils-cross-'+ targetarch, 'binutils-native'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True)
33 34
34 def test_sstate_creation_distro_specific_fail(self): 35 def test_sstate_creation_distro_specific_fail(self):
35 self.run_test_sstate_creation(['binutils-cross', 'binutils-native'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True, should_pass=False) 36 targetarch = get_bb_var('TARGET_ARCH')
37 self.run_test_sstate_creation(['binutils-cross-'+ targetarch, 'binutils-native'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True, should_pass=False)
36 38
37 def test_sstate_creation_distro_nonspecific_pass(self): 39 def test_sstate_creation_distro_nonspecific_pass(self):
38 self.run_test_sstate_creation(['eglibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) 40 self.run_test_sstate_creation(['eglibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
@@ -59,13 +61,15 @@ class SStateTests(SStateBase):
59 self.assertTrue(not tgz_removed, msg="do_cleansstate didn't remove .tgz sstate files for: %s" % ', '.join(map(str, targets))) 61 self.assertTrue(not tgz_removed, msg="do_cleansstate didn't remove .tgz sstate files for: %s" % ', '.join(map(str, targets)))
60 62
61 def test_cleansstate_task_distro_specific_nonspecific(self): 63 def test_cleansstate_task_distro_specific_nonspecific(self):
62 self.run_test_cleansstate_task(['binutils-cross', 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) 64 targetarch = get_bb_var('TARGET_ARCH')
65 self.run_test_cleansstate_task(['binutils-cross-' + targetarch, 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=True, temp_sstate_location=True)
63 66
64 def test_cleansstate_task_distro_nonspecific(self): 67 def test_cleansstate_task_distro_nonspecific(self):
65 self.run_test_cleansstate_task(['eglibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) 68 self.run_test_cleansstate_task(['eglibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
66 69
67 def test_cleansstate_task_distro_specific(self): 70 def test_cleansstate_task_distro_specific(self):
68 self.run_test_cleansstate_task(['binutils-cross', 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) 71 targetarch = get_bb_var('TARGET_ARCH')
72 self.run_test_cleansstate_task(['binutils-cross-'+ targetarch, 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True)
69 73
70 74
71 # Test rebuilding of distro-specific sstate files 75 # Test rebuilding of distro-specific sstate files
@@ -95,10 +99,12 @@ class SStateTests(SStateBase):
95 self.assertTrue(created_once == [], msg="The following sstate files ware created only in the second run: %s" % ', '.join(map(str, created_once))) 99 self.assertTrue(created_once == [], msg="The following sstate files ware created only in the second run: %s" % ', '.join(map(str, created_once)))
96 100
97 def test_rebuild_distro_specific_sstate_cross_native_targets(self): 101 def test_rebuild_distro_specific_sstate_cross_native_targets(self):
98 self.run_test_rebuild_distro_specific_sstate(['binutils-cross', 'binutils-native'], temp_sstate_location=True) 102 targetarch = get_bb_var('TARGET_ARCH')
103 self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + targetarch, 'binutils-native'], temp_sstate_location=True)
99 104
100 def test_rebuild_distro_specific_sstate_cross_target(self): 105 def test_rebuild_distro_specific_sstate_cross_target(self):
101 self.run_test_rebuild_distro_specific_sstate(['binutils-cross'], temp_sstate_location=True) 106 targetarch = get_bb_var('TARGET_ARCH')
107 self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + targetarch], temp_sstate_location=True)
102 108
103 def test_rebuild_distro_specific_sstate_native_target(self): 109 def test_rebuild_distro_specific_sstate_native_target(self):
104 self.run_test_rebuild_distro_specific_sstate(['binutils-native'], temp_sstate_location=True) 110 self.run_test_rebuild_distro_specific_sstate(['binutils-native'], temp_sstate_location=True)