diff options
Diffstat (limited to 'external/poky/meta/recipes-sato/images')
3 files changed, 34 insertions, 4 deletions
diff --git a/external/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb b/external/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb new file mode 100644 index 00000000..36412173 --- /dev/null +++ b/external/poky/meta/recipes-sato/images/core-image-sato-ptest-fast.bb @@ -0,0 +1,19 @@ +require core-image-sato-sdk.bb +require conf/distro/include/ptest-packagelists.inc + +IMAGE_INSTALL += "${PTESTS_FAST}" + +DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." + +# This image is sufficiently large (~1.8GB) that it can't actually fit in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add just 1500MB. +# strace-ptest in particular needs more than 500MB +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "1524288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" + +# Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places +PTEST_EXPECT_FAILURE = "1" diff --git a/external/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/external/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb index 22df0579..bf749acd 100644 --- a/external/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ b/external/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb @@ -1,15 +1,23 @@ require core-image-sato-sdk.bb +require conf/distro/include/ptest-packagelists.inc DESCRIPTION += "Also includes ptest packages." -IMAGE_FEATURES += "ptest-pkgs" +PROVIDES += "core-image-sato-ptest" + +# Also include ptests which may not otherwise be included in a sato image +IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}" # This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1200MB. +# box) and explicitly add just 1100MB. # strace-ptest in particular needs more than 500MB IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1224288" +IMAGE_ROOTFS_EXTRA_SPACE = "1124288" # ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" +# also lttng-tools needs /tmp that has at least 1G +QB_MEM = "-m 2048" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" diff --git a/external/poky/meta/recipes-sato/images/core-image-sato.bb b/external/poky/meta/recipes-sato/images/core-image-sato.bb index b8979502..673106eb 100644 --- a/external/poky/meta/recipes-sato/images/core-image-sato.bb +++ b/external/poky/meta/recipes-sato/images/core-image-sato.bb @@ -10,3 +10,6 @@ inherit core-image TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0" TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" + +QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' +QB_MEM_qemumips = "-m 256" |