diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-04 17:36:10 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-04 17:37:19 +0100 |
commit | 56a39e9b67074abfb166c01d843b6680ee61abdf (patch) | |
tree | a423deaf6af83e4bd3ccf6283983d1fd98dea826 | |
parent | 5459af33b9b60a1b9c8cfe93a3f55b9fae3d6984 (diff) | |
download | poky-56a39e9b67074abfb166c01d843b6680ee61abdf.tar.gz |
sstatetests: Use TUNE_ARCH instead of TARGET_ARCH
The scripts extact variable values from bitbake -e. Unfortunately
TARGET_ARCH is unset from that environment so we use TUNE_ARCH instead
which will have the value we need.
(From OE-Core rev: b77494025b3d47fd5130ae6c445ac84cabb1f91e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/selftest/sstatetests.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index 7d12faaece..44dcea847f 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py | |||
@@ -29,11 +29,11 @@ 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 | targetarch = get_bb_var('TARGET_ARCH') | 32 | targetarch = get_bb_var('TUNE_ARCH') |
33 | self.run_test_sstate_creation(['binutils-cross-'+ targetarch, 'binutils-native'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) | 33 | self.run_test_sstate_creation(['binutils-cross-'+ targetarch, 'binutils-native'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) |
34 | 34 | ||
35 | def test_sstate_creation_distro_specific_fail(self): | 35 | def test_sstate_creation_distro_specific_fail(self): |
36 | targetarch = get_bb_var('TARGET_ARCH') | 36 | targetarch = get_bb_var('TUNE_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) | 37 | self.run_test_sstate_creation(['binutils-cross-'+ targetarch, 'binutils-native'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True, should_pass=False) |
38 | 38 | ||
39 | def test_sstate_creation_distro_nonspecific_pass(self): | 39 | def test_sstate_creation_distro_nonspecific_pass(self): |
@@ -61,14 +61,14 @@ class SStateTests(SStateBase): | |||
61 | 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))) |
62 | 62 | ||
63 | def test_cleansstate_task_distro_specific_nonspecific(self): | 63 | def test_cleansstate_task_distro_specific_nonspecific(self): |
64 | targetarch = get_bb_var('TARGET_ARCH') | 64 | targetarch = get_bb_var('TUNE_ARCH') |
65 | self.run_test_cleansstate_task(['binutils-cross-' + targetarch, 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) | 65 | self.run_test_cleansstate_task(['binutils-cross-' + targetarch, 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) |
66 | 66 | ||
67 | def test_cleansstate_task_distro_nonspecific(self): | 67 | def test_cleansstate_task_distro_nonspecific(self): |
68 | 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) |
69 | 69 | ||
70 | def test_cleansstate_task_distro_specific(self): | 70 | def test_cleansstate_task_distro_specific(self): |
71 | targetarch = get_bb_var('TARGET_ARCH') | 71 | targetarch = get_bb_var('TUNE_ARCH') |
72 | self.run_test_cleansstate_task(['binutils-cross-'+ targetarch, 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) | 72 | self.run_test_cleansstate_task(['binutils-cross-'+ targetarch, 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) |
73 | 73 | ||
74 | 74 | ||
@@ -99,11 +99,11 @@ class SStateTests(SStateBase): | |||
99 | 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))) |
100 | 100 | ||
101 | def test_rebuild_distro_specific_sstate_cross_native_targets(self): | 101 | def test_rebuild_distro_specific_sstate_cross_native_targets(self): |
102 | targetarch = get_bb_var('TARGET_ARCH') | 102 | targetarch = get_bb_var('TUNE_ARCH') |
103 | self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + targetarch, 'binutils-native'], temp_sstate_location=True) | 103 | self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + targetarch, 'binutils-native'], temp_sstate_location=True) |
104 | 104 | ||
105 | def test_rebuild_distro_specific_sstate_cross_target(self): | 105 | def test_rebuild_distro_specific_sstate_cross_target(self): |
106 | targetarch = get_bb_var('TARGET_ARCH') | 106 | targetarch = get_bb_var('TUNE_ARCH') |
107 | self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + targetarch], temp_sstate_location=True) | 107 | self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + targetarch], temp_sstate_location=True) |
108 | 108 | ||
109 | def test_rebuild_distro_specific_sstate_native_target(self): | 109 | def test_rebuild_distro_specific_sstate_native_target(self): |