diff options
-rw-r--r-- | meta/recipes-core/images/core-image-ptest.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.11.4.bb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/images/core-image-ptest.bb b/meta/recipes-core/images/core-image-ptest.bb index ddc56c8f9f..74cf933b72 100644 --- a/meta/recipes-core/images/core-image-ptest.bb +++ b/meta/recipes-core/images/core-image-ptest.bb | |||
@@ -26,6 +26,7 @@ IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-lttng-tools = "1524288" | |||
26 | # ptests need more memory than standard to avoid the OOM killer | 26 | # ptests need more memory than standard to avoid the OOM killer |
27 | QB_MEM = "-m 1024" | 27 | QB_MEM = "-m 1024" |
28 | QB_MEM:virtclass-mcextend-lttng-tools = "-m 4096" | 28 | QB_MEM:virtclass-mcextend-lttng-tools = "-m 4096" |
29 | QB_MEM:virtclass-mcextend-python3 = "-m 2048" | ||
29 | QB_MEM:virtclass-mcextend-python3-cryptography = "-m 4096" | 30 | QB_MEM:virtclass-mcextend-python3-cryptography = "-m 4096" |
30 | 31 | ||
31 | TEST_SUITES = "ping ssh parselogs ptest" | 32 | TEST_SUITES = "ping ssh parselogs ptest" |
diff --git a/meta/recipes-devtools/python/python3/run-ptest b/meta/recipes-devtools/python/python3/run-ptest index 05396e91ab..ee1130284b 100644 --- a/meta/recipes-devtools/python/python3/run-ptest +++ b/meta/recipes-devtools/python/python3/run-ptest | |||
@@ -1,3 +1,3 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | SETUPTOOLS_USE_DISTUTILS=nonlocal python3 -m test -v | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' | 3 | SETUPTOOLS_USE_DISTUTILS=nonlocal python3 -m test -v -j 4 | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' |
diff --git a/meta/recipes-devtools/python/python3_3.11.4.bb b/meta/recipes-devtools/python/python3_3.11.4.bb index 86ecc4e297..2d7b1bac2c 100644 --- a/meta/recipes-devtools/python/python3_3.11.4.bb +++ b/meta/recipes-devtools/python/python3_3.11.4.bb | |||
@@ -426,7 +426,7 @@ FILES:${PN}-man = "${datadir}/man" | |||
426 | # See https://bugs.python.org/issue18748 and https://bugs.python.org/issue37395 | 426 | # See https://bugs.python.org/issue18748 and https://bugs.python.org/issue37395 |
427 | RDEPENDS:libpython3:append:libc-glibc = " libgcc" | 427 | RDEPENDS:libpython3:append:libc-glibc = " libgcc" |
428 | RDEPENDS:${PN}-ctypes:append:libc-glibc = " ${MLPREFIX}ldconfig" | 428 | RDEPENDS:${PN}-ctypes:append:libc-glibc = " ${MLPREFIX}ldconfig" |
429 | RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-cgitb ${PN}-zipapp unzip bzip2 libgcc tzdata coreutils sed" | 429 | RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-cgitb ${PN}-zipapp unzip bzip2 libgcc tzdata coreutils sed gcc g++ binutils" |
430 | RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-fr-fr locale-base-en-us locale-base-tr-tr locale-base-de-de" | 430 | RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-fr-fr locale-base-en-us locale-base-tr-tr locale-base-de-de" |
431 | RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}" | 431 | RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}" |
432 | RDEPENDS:${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter ${MLPREFIX}tcl', '', d)}" | 432 | RDEPENDS:${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter ${MLPREFIX}tcl', '', d)}" |