diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/sstatetests.py | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index 643dd38647..43a008d555 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py | |||
@@ -223,28 +223,33 @@ class SStateTests(SStateBase): | |||
223 | def test_sstate_32_64_same_hash(self): | 223 | def test_sstate_32_64_same_hash(self): |
224 | """ | 224 | """ |
225 | The sstate checksums for both native and target should not vary whether | 225 | The sstate checksums for both native and target should not vary whether |
226 | they're built on a 32 or 64 bit system. Rather than requiring two different | 226 | they're built on a 32 or 64 bit system. Rather than requiring two different |
227 | build machines and running a builds, override the variables calling uname() | 227 | build machines and running a builds, override the variables calling uname() |
228 | manually and check using bitbake -S. | 228 | manually and check using bitbake -S. |
229 | 229 | ||
230 | Also check that SDKMACHINE changing doesn't change any of these stamps. | 230 | Also check that SDKMACHINE and PARALLEL_MAKE changing doesn't change any |
231 | of these stamps. | ||
231 | """ | 232 | """ |
232 | 233 | ||
233 | topdir = get_bb_var('TOPDIR') | 234 | topdir = get_bb_var('TOPDIR') |
234 | targetvendor = get_bb_var('TARGET_VENDOR') | 235 | targetvendor = get_bb_var('TARGET_VENDOR') |
235 | self.write_config(""" | 236 | self.write_config(""" |
236 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" | 237 | MACHINE = "qemux86" |
237 | BUILD_ARCH = \"x86_64\" | 238 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash" |
238 | BUILD_OS = \"linux\" | 239 | BUILD_ARCH = "x86_64" |
239 | SDKMACHINE = \"x86_64\" | 240 | BUILD_OS = "linux" |
241 | SDKMACHINE = "x86_64" | ||
242 | PARALLEL_MAKE = "-j 1" | ||
240 | """) | 243 | """) |
241 | self.track_for_cleanup(topdir + "/tmp-sstatesamehash") | 244 | self.track_for_cleanup(topdir + "/tmp-sstatesamehash") |
242 | bitbake("core-image-sato -S none") | 245 | bitbake("core-image-sato -S none") |
243 | self.write_config(""" | 246 | self.write_config(""" |
244 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 247 | MACHINE = "qemux86" |
245 | BUILD_ARCH = \"i686\" | 248 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" |
246 | BUILD_OS = \"linux\" | 249 | BUILD_ARCH = "i686" |
247 | SDKMACHINE = \"i686\" | 250 | BUILD_OS = "linux" |
251 | SDKMACHINE = "i686" | ||
252 | PARALLEL_MAKE = "-j 2" | ||
248 | """) | 253 | """) |
249 | self.track_for_cleanup(topdir + "/tmp-sstatesamehash2") | 254 | self.track_for_cleanup(topdir + "/tmp-sstatesamehash2") |
250 | bitbake("core-image-sato -S none") | 255 | bitbake("core-image-sato -S none") |
@@ -253,9 +258,10 @@ SDKMACHINE = \"i686\" | |||
253 | f = [] | 258 | f = [] |
254 | for root, dirs, files in os.walk(d): | 259 | for root, dirs, files in os.walk(d): |
255 | if "core-image-sato" in root: | 260 | if "core-image-sato" in root: |
256 | # SDKMACHINE changing will change do_rootfs/do_testimage/do_build stamps of core-image-sato itself | 261 | # SDKMACHINE changing will change |
257 | # which is safe to ignore | 262 | # do_rootfs/do_testimage/do_build stamps of images which |
258 | continue | 263 | # is safe to ignore. |
264 | continue | ||
259 | f.extend(os.path.join(root, name) for name in files) | 265 | f.extend(os.path.join(root, name) for name in files) |
260 | return f | 266 | return f |
261 | files1 = get_files(topdir + "/tmp-sstatesamehash/stamps/") | 267 | files1 = get_files(topdir + "/tmp-sstatesamehash/stamps/") |