summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2017-01-31 15:05:52 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 23:27:47 +0000
commit3eef8f7955d09063b1ebfd7ea5cc74ee67fcc4a2 (patch)
tree4b40fe74555d51040b56b5d2109f4ddf00822503
parent5582b67f6d1d53290f485afe8d459380d90f116e (diff)
downloadpoky-3eef8f7955d09063b1ebfd7ea5cc74ee67fcc4a2.tar.gz
testimage.bbclass: Fixes about suites and dependencies
There are some missing suites on sato-sdk and lsb-sdk images so add it. The createrepo-native needs to be built before run testimage in order to create a repository from install packages. The DL_DIR data also needs to be updated from the current bitbake environment instead of use the value from testdata file. [YOCTO #10964] (From OE-Core rev: 42f3026b39519ba98ae3153329622ce670d57c09) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/testimage.bbclass9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 47bccbca37..7495fe1e14 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -49,11 +49,11 @@ DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}"
49DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs ${RPMTESTSUITE}" 49DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs ${RPMTESTSUITE}"
50DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg parselogs ${RPMTESTSUITE} \ 50DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg parselogs ${RPMTESTSUITE} \
51 ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)}" 51 ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)}"
52DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} connman xorg perl python \ 52DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} buildcvs buildiptables buildgalculator \
53 ${DEVTESTSUITE} parselogs ${RPMTESTSUITE}" 53 connman ${DEVTESTSUITE} logrotate perl parselogs python ${RPMTESTSUITE} xorg"
54DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python parselogs ${RPMTESTSUITE}" 54DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python parselogs ${RPMTESTSUITE}"
55DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcvs buildiptables buildgalculator \ 55DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcvs buildiptables buildgalculator \
56 connman ${DEVTESTSUITE} pam perl python parselogs ${RPMTESTSUITE}" 56 connman ${DEVTESTSUITE} logrotate pam parselogs perl python ${RPMTESTSUITE}"
57DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto" 57DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
58 58
59# aarch64 has no graphics 59# aarch64 has no graphics
@@ -79,13 +79,14 @@ TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python-smartp
79TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg-utils-native:do_populate_sysroot', '', d)}" 79TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg-utils-native:do_populate_sysroot', '', d)}"
80TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt-native:do_populate_sysroot', '', d)}" 80TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt-native:do_populate_sysroot', '', d)}"
81TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python-smartpm-native:do_populate_sysroot', '', d)}" 81TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python-smartpm-native:do_populate_sysroot', '', d)}"
82TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'createrepo-native:do_populate_sysroot', '', d)}"
82 83
83TESTIMAGELOCK = "${TMPDIR}/testimage.lock" 84TESTIMAGELOCK = "${TMPDIR}/testimage.lock"
84TESTIMAGELOCK_qemuall = "" 85TESTIMAGELOCK_qemuall = ""
85 86
86TESTIMAGE_DUMP_DIR ?= "/tmp/oe-saved-tests/" 87TESTIMAGE_DUMP_DIR ?= "/tmp/oe-saved-tests/"
87 88
88TESTIMAGE_UPDATE_VARS ?= "WORKDIR DEPLOY_DIR" 89TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR"
89 90
90testimage_dump_target () { 91testimage_dump_target () {
91 top -bn1 92 top -bn1