diff options
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/sstatetests.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 49d650bac7..ae295bef5f 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py | |||
@@ -378,7 +378,6 @@ class SStateHashSameSigs(SStateBase): | |||
378 | self.write_config(""" | 378 | self.write_config(""" |
379 | MACHINE = "qemux86" | 379 | MACHINE = "qemux86" |
380 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash" | 380 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash" |
381 | TCLIBCAPPEND = "" | ||
382 | BUILD_ARCH = "x86_64" | 381 | BUILD_ARCH = "x86_64" |
383 | BUILD_OS = "linux" | 382 | BUILD_OS = "linux" |
384 | SDKMACHINE = "x86_64" | 383 | SDKMACHINE = "x86_64" |
@@ -390,7 +389,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash" | |||
390 | self.write_config(""" | 389 | self.write_config(""" |
391 | MACHINE = "qemux86" | 390 | MACHINE = "qemux86" |
392 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" | 391 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" |
393 | TCLIBCAPPEND = "" | ||
394 | BUILD_ARCH = "i686" | 392 | BUILD_ARCH = "i686" |
395 | BUILD_OS = "linux" | 393 | BUILD_OS = "linux" |
396 | SDKMACHINE = "i686" | 394 | SDKMACHINE = "i686" |
@@ -426,7 +424,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash" | |||
426 | 424 | ||
427 | self.write_config(""" | 425 | self.write_config(""" |
428 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" | 426 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" |
429 | TCLIBCAPPEND = \"\" | ||
430 | NATIVELSBSTRING = \"DistroA\" | 427 | NATIVELSBSTRING = \"DistroA\" |
431 | BB_SIGNATURE_HANDLER = "OEBasicHash" | 428 | BB_SIGNATURE_HANDLER = "OEBasicHash" |
432 | """) | 429 | """) |
@@ -434,7 +431,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash" | |||
434 | bitbake("core-image-weston -S none") | 431 | bitbake("core-image-weston -S none") |
435 | self.write_config(""" | 432 | self.write_config(""" |
436 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 433 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" |
437 | TCLIBCAPPEND = \"\" | ||
438 | NATIVELSBSTRING = \"DistroB\" | 434 | NATIVELSBSTRING = \"DistroB\" |
439 | BB_SIGNATURE_HANDLER = "OEBasicHash" | 435 | BB_SIGNATURE_HANDLER = "OEBasicHash" |
440 | """) | 436 | """) |
@@ -463,14 +459,12 @@ class SStateHashSameSigs2(SStateBase): | |||
463 | 459 | ||
464 | configA = """ | 460 | configA = """ |
465 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" | 461 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" |
466 | TCLIBCAPPEND = \"\" | ||
467 | MACHINE = \"qemux86-64\" | 462 | MACHINE = \"qemux86-64\" |
468 | BB_SIGNATURE_HANDLER = "OEBasicHash" | 463 | BB_SIGNATURE_HANDLER = "OEBasicHash" |
469 | """ | 464 | """ |
470 | #OLDEST_KERNEL is arch specific so set to a different value here for testing | 465 | #OLDEST_KERNEL is arch specific so set to a different value here for testing |
471 | configB = """ | 466 | configB = """ |
472 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 467 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" |
473 | TCLIBCAPPEND = \"\" | ||
474 | MACHINE = \"qemuarm\" | 468 | MACHINE = \"qemuarm\" |
475 | OLDEST_KERNEL = \"3.3.0\" | 469 | OLDEST_KERNEL = \"3.3.0\" |
476 | BB_SIGNATURE_HANDLER = "OEBasicHash" | 470 | BB_SIGNATURE_HANDLER = "OEBasicHash" |
@@ -486,7 +480,6 @@ WARN_QA:append = " someotheroption" | |||
486 | 480 | ||
487 | configA = """ | 481 | configA = """ |
488 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" | 482 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" |
489 | TCLIBCAPPEND = \"\" | ||
490 | MACHINE = \"qemux86-64\" | 483 | MACHINE = \"qemux86-64\" |
491 | require conf/multilib.conf | 484 | require conf/multilib.conf |
492 | MULTILIBS = \"multilib:lib32\" | 485 | MULTILIBS = \"multilib:lib32\" |
@@ -495,7 +488,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash" | |||
495 | """ | 488 | """ |
496 | configB = """ | 489 | configB = """ |
497 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 490 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" |
498 | TCLIBCAPPEND = \"\" | ||
499 | MACHINE = \"qemuarm\" | 491 | MACHINE = \"qemuarm\" |
500 | require conf/multilib.conf | 492 | require conf/multilib.conf |
501 | MULTILIBS = \"\" | 493 | MULTILIBS = \"\" |
@@ -513,7 +505,6 @@ class SStateHashSameSigs3(SStateBase): | |||
513 | 505 | ||
514 | self.write_config(""" | 506 | self.write_config(""" |
515 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" | 507 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" |
516 | TCLIBCAPPEND = \"\" | ||
517 | MACHINE = \"qemux86\" | 508 | MACHINE = \"qemux86\" |
518 | require conf/multilib.conf | 509 | require conf/multilib.conf |
519 | MULTILIBS = "multilib:lib32" | 510 | MULTILIBS = "multilib:lib32" |
@@ -524,7 +515,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash" | |||
524 | bitbake("world meta-toolchain -S none") | 515 | bitbake("world meta-toolchain -S none") |
525 | self.write_config(""" | 516 | self.write_config(""" |
526 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 517 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" |
527 | TCLIBCAPPEND = \"\" | ||
528 | MACHINE = \"qemux86copy\" | 518 | MACHINE = \"qemux86copy\" |
529 | require conf/multilib.conf | 519 | require conf/multilib.conf |
530 | MULTILIBS = "multilib:lib32" | 520 | MULTILIBS = "multilib:lib32" |
@@ -561,7 +551,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash" | |||
561 | 551 | ||
562 | self.write_config(""" | 552 | self.write_config(""" |
563 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" | 553 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" |
564 | TCLIBCAPPEND = \"\" | ||
565 | MACHINE = \"qemux86\" | 554 | MACHINE = \"qemux86\" |
566 | require conf/multilib.conf | 555 | require conf/multilib.conf |
567 | MULTILIBS = "multilib:lib32" | 556 | MULTILIBS = "multilib:lib32" |
@@ -572,7 +561,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash" | |||
572 | bitbake("binutils-native -S none") | 561 | bitbake("binutils-native -S none") |
573 | self.write_config(""" | 562 | self.write_config(""" |
574 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 563 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" |
575 | TCLIBCAPPEND = \"\" | ||
576 | MACHINE = \"qemux86copy\" | 564 | MACHINE = \"qemux86copy\" |
577 | BB_SIGNATURE_HANDLER = "OEBasicHash" | 565 | BB_SIGNATURE_HANDLER = "OEBasicHash" |
578 | """) | 566 | """) |
@@ -600,7 +588,6 @@ class SStateHashSameSigs4(SStateBase): | |||
600 | 588 | ||
601 | self.write_config(""" | 589 | self.write_config(""" |
602 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash" | 590 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash" |
603 | TCLIBCAPPEND = "" | ||
604 | BB_NUMBER_THREADS = "${@oe.utils.cpu_count()}" | 591 | BB_NUMBER_THREADS = "${@oe.utils.cpu_count()}" |
605 | PARALLEL_MAKE = "-j 1" | 592 | PARALLEL_MAKE = "-j 1" |
606 | DL_DIR = "${TOPDIR}/download1" | 593 | DL_DIR = "${TOPDIR}/download1" |
@@ -615,7 +602,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash" | |||
615 | bitbake("world meta-toolchain -S none") | 602 | bitbake("world meta-toolchain -S none") |
616 | self.write_config(""" | 603 | self.write_config(""" |
617 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" | 604 | TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" |
618 | TCLIBCAPPEND = "" | ||
619 | BB_NUMBER_THREADS = "${@oe.utils.cpu_count()+1}" | 605 | BB_NUMBER_THREADS = "${@oe.utils.cpu_count()+1}" |
620 | PARALLEL_MAKE = "-j 2" | 606 | PARALLEL_MAKE = "-j 2" |
621 | DL_DIR = "${TOPDIR}/download2" | 607 | DL_DIR = "${TOPDIR}/download2" |
@@ -726,7 +712,6 @@ class SStateFindSiginfo(SStateBase): | |||
726 | """ | 712 | """ |
727 | self.write_config(""" | 713 | self.write_config(""" |
728 | TMPDIR = \"${TOPDIR}/tmp-sstates-findsiginfo\" | 714 | TMPDIR = \"${TOPDIR}/tmp-sstates-findsiginfo\" |
729 | TCLIBCAPPEND = \"\" | ||
730 | MACHINE = \"qemux86-64\" | 715 | MACHINE = \"qemux86-64\" |
731 | require conf/multilib.conf | 716 | require conf/multilib.conf |
732 | MULTILIBS = "multilib:lib32" | 717 | MULTILIBS = "multilib:lib32" |