From 56a39e9b67074abfb166c01d843b6680ee61abdf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 4 May 2014 17:36:10 +0100 Subject: [PATCH] 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 --- meta/lib/oeqa/selftest/sstatetests.py | 12 ++++++------ 1 file 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): self.assertTrue(not file_tracker , msg="Found sstate files in the wrong place for: %s" % ', '.join(map(str, targets))) def test_sstate_creation_distro_specific_pass(self): - targetarch = get_bb_var('TARGET_ARCH') + targetarch = get_bb_var('TUNE_ARCH') self.run_test_sstate_creation(['binutils-cross-'+ targetarch, 'binutils-native'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) def test_sstate_creation_distro_specific_fail(self): - targetarch = get_bb_var('TARGET_ARCH') + targetarch = get_bb_var('TUNE_ARCH') self.run_test_sstate_creation(['binutils-cross-'+ targetarch, 'binutils-native'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True, should_pass=False) def test_sstate_creation_distro_nonspecific_pass(self): @@ -61,14 +61,14 @@ class SStateTests(SStateBase): self.assertTrue(not tgz_removed, msg="do_cleansstate didn't remove .tgz sstate files for: %s" % ', '.join(map(str, targets))) def test_cleansstate_task_distro_specific_nonspecific(self): - targetarch = get_bb_var('TARGET_ARCH') + targetarch = get_bb_var('TUNE_ARCH') self.run_test_cleansstate_task(['binutils-cross-' + targetarch, 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) def test_cleansstate_task_distro_nonspecific(self): self.run_test_cleansstate_task(['eglibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) def test_cleansstate_task_distro_specific(self): - targetarch = get_bb_var('TARGET_ARCH') + targetarch = get_bb_var('TUNE_ARCH') self.run_test_cleansstate_task(['binutils-cross-'+ targetarch, 'binutils-native', 'eglibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) @@ -99,11 +99,11 @@ class SStateTests(SStateBase): self.assertTrue(created_once == [], msg="The following sstate files ware created only in the second run: %s" % ', '.join(map(str, created_once))) def test_rebuild_distro_specific_sstate_cross_native_targets(self): - targetarch = get_bb_var('TARGET_ARCH') + targetarch = get_bb_var('TUNE_ARCH') self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + targetarch, 'binutils-native'], temp_sstate_location=True) def test_rebuild_distro_specific_sstate_cross_target(self): - targetarch = get_bb_var('TARGET_ARCH') + targetarch = get_bb_var('TUNE_ARCH') self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + targetarch], temp_sstate_location=True) def test_rebuild_distro_specific_sstate_native_target(self):