summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/sstatetests.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index 7194225c0a..077d6e5374 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -262,6 +262,7 @@ class SStateTests(SStateBase):
262 self.write_config(""" 262 self.write_config("""
263MACHINE = "qemux86" 263MACHINE = "qemux86"
264TMPDIR = "${TOPDIR}/tmp-sstatesamehash" 264TMPDIR = "${TOPDIR}/tmp-sstatesamehash"
265TCLIBCAPPEND = ""
265BUILD_ARCH = "x86_64" 266BUILD_ARCH = "x86_64"
266BUILD_OS = "linux" 267BUILD_OS = "linux"
267SDKMACHINE = "x86_64" 268SDKMACHINE = "x86_64"
@@ -272,6 +273,7 @@ PACKAGE_CLASSES = "package_rpm package_ipk package_deb"
272 self.write_config(""" 273 self.write_config("""
273MACHINE = "qemux86" 274MACHINE = "qemux86"
274TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" 275TMPDIR = "${TOPDIR}/tmp-sstatesamehash2"
276TCLIBCAPPEND = ""
275BUILD_ARCH = "i686" 277BUILD_ARCH = "i686"
276BUILD_OS = "linux" 278BUILD_OS = "linux"
277SDKMACHINE = "i686" 279SDKMACHINE = "i686"
@@ -307,12 +309,14 @@ PACKAGE_CLASSES = "package_rpm package_ipk package_deb"
307 309
308 self.write_config(""" 310 self.write_config("""
309TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 311TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
312TCLIBCAPPEND = \"\"
310NATIVELSBSTRING = \"DistroA\" 313NATIVELSBSTRING = \"DistroA\"
311""") 314""")
312 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") 315 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash")
313 bitbake("core-image-sato -S none") 316 bitbake("core-image-sato -S none")
314 self.write_config(""" 317 self.write_config("""
315TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 318TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
319TCLIBCAPPEND = \"\"
316NATIVELSBSTRING = \"DistroB\" 320NATIVELSBSTRING = \"DistroB\"
317""") 321""")
318 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") 322 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2")
@@ -340,10 +344,12 @@ NATIVELSBSTRING = \"DistroB\"
340 344
341 configA = """ 345 configA = """
342TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 346TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
347TCLIBCAPPEND = \"\"
343MACHINE = \"qemux86-64\" 348MACHINE = \"qemux86-64\"
344""" 349"""
345 configB = """ 350 configB = """
346TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 351TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
352TCLIBCAPPEND = \"\"
347MACHINE = \"qemuarm\" 353MACHINE = \"qemuarm\"
348""" 354"""
349 self.sstate_allarch_samesigs(configA, configB) 355 self.sstate_allarch_samesigs(configA, configB)
@@ -356,6 +362,7 @@ MACHINE = \"qemuarm\"
356 362
357 configA = """ 363 configA = """
358TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 364TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
365TCLIBCAPPEND = \"\"
359MACHINE = \"qemux86-64\" 366MACHINE = \"qemux86-64\"
360require conf/multilib.conf 367require conf/multilib.conf
361MULTILIBS = \"multilib:lib32\" 368MULTILIBS = \"multilib:lib32\"
@@ -363,6 +370,7 @@ DEFAULTTUNE_virtclass-multilib-lib32 = \"x86\"
363""" 370"""
364 configB = """ 371 configB = """
365TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 372TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
373TCLIBCAPPEND = \"\"
366MACHINE = \"qemuarm\" 374MACHINE = \"qemuarm\"
367require conf/multilib.conf 375require conf/multilib.conf
368MULTILIBS = \"\" 376MULTILIBS = \"\"
@@ -407,6 +415,7 @@ MULTILIBS = \"\"
407 415
408 self.write_config(""" 416 self.write_config("""
409TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 417TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
418TCLIBCAPPEND = \"\"
410MACHINE = \"qemux86\" 419MACHINE = \"qemux86\"
411require conf/multilib.conf 420require conf/multilib.conf
412MULTILIBS = "multilib:lib32" 421MULTILIBS = "multilib:lib32"
@@ -416,6 +425,7 @@ DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
416 bitbake("world meta-toolchain -S none") 425 bitbake("world meta-toolchain -S none")
417 self.write_config(""" 426 self.write_config("""
418TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 427TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
428TCLIBCAPPEND = \"\"
419MACHINE = \"qemux86copy\" 429MACHINE = \"qemux86copy\"
420require conf/multilib.conf 430require conf/multilib.conf
421MULTILIBS = "multilib:lib32" 431MULTILIBS = "multilib:lib32"
@@ -451,6 +461,7 @@ DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
451 461
452 self.write_config(""" 462 self.write_config("""
453TMPDIR = "${TOPDIR}/tmp-sstatesamehash" 463TMPDIR = "${TOPDIR}/tmp-sstatesamehash"
464TCLIBCAPPEND = ""
454BB_NUMBER_THREADS = "${@oe.utils.cpu_count()}" 465BB_NUMBER_THREADS = "${@oe.utils.cpu_count()}"
455PARALLEL_MAKE = "-j 1" 466PARALLEL_MAKE = "-j 1"
456DL_DIR = "${TOPDIR}/download1" 467DL_DIR = "${TOPDIR}/download1"
@@ -464,6 +475,7 @@ http_proxy = ""
464 bitbake("world meta-toolchain -S none") 475 bitbake("world meta-toolchain -S none")
465 self.write_config(""" 476 self.write_config("""
466TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" 477TMPDIR = "${TOPDIR}/tmp-sstatesamehash2"
478TCLIBCAPPEND = ""
467BB_NUMBER_THREADS = "${@oe.utils.cpu_count()+1}" 479BB_NUMBER_THREADS = "${@oe.utils.cpu_count()+1}"
468PARALLEL_MAKE = "-j 2" 480PARALLEL_MAKE = "-j 2"
469DL_DIR = "${TOPDIR}/download2" 481DL_DIR = "${TOPDIR}/download2"