diff options
| -rw-r--r-- | meta-oe/recipes-support/poco/poco/run-ptest | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poco/poco_1.11.2.bb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/poco/poco/run-ptest b/meta-oe/recipes-support/poco/poco/run-ptest index c9896eadee..521cc08a75 100644 --- a/meta-oe/recipes-support/poco/poco/run-ptest +++ b/meta-oe/recipes-support/poco/poco/run-ptest | |||
| @@ -3,6 +3,6 @@ while read runner; do | |||
| 3 | oldpath=`pwd` >/dev/null | 3 | oldpath=`pwd` >/dev/null |
| 4 | cd bin | 4 | cd bin |
| 5 | echo Testing $runner | 5 | echo Testing $runner |
| 6 | ./$runner-testrunner -all | 6 | ./$runner -ignore $oldpath/cppignore.lnx -all |
| 7 | cd $oldpath >/dev/null | 7 | cd $oldpath >/dev/null |
| 8 | done < testrunners | 8 | done < testrunners |
diff --git a/meta-oe/recipes-support/poco/poco_1.11.2.bb b/meta-oe/recipes-support/poco/poco_1.11.2.bb index 075eb72a06..4711c6bb92 100644 --- a/meta-oe/recipes-support/poco/poco_1.11.2.bb +++ b/meta-oe/recipes-support/poco/poco_1.11.2.bb | |||
| @@ -66,17 +66,14 @@ python populate_packages:prepend () { | |||
| 66 | poco_libdir = d.expand('${libdir}') | 66 | poco_libdir = d.expand('${libdir}') |
| 67 | pn = d.getVar("PN") | 67 | pn = d.getVar("PN") |
| 68 | packages = [] | 68 | packages = [] |
| 69 | testrunners = [] | ||
| 70 | 69 | ||
| 71 | def hook(f, pkg, file_regex, output_pattern, modulename): | 70 | def hook(f, pkg, file_regex, output_pattern, modulename): |
| 72 | packages.append(pkg) | 71 | packages.append(pkg) |
| 73 | testrunners.append(modulename) | ||
| 74 | 72 | ||
| 75 | do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$', | 73 | do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$', |
| 76 | 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) | 74 | 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) |
| 77 | 75 | ||
| 78 | d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) | 76 | d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) |
| 79 | d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) | ||
| 80 | } | 77 | } |
| 81 | 78 | ||
| 82 | do_install_ptest () { | 79 | do_install_ptest () { |
| @@ -84,7 +81,11 @@ do_install_ptest () { | |||
| 84 | cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} | 81 | cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} |
| 85 | cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ | 82 | cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ |
| 86 | find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; | 83 | find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; |
| 87 | echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" | 84 | rm -f ${D}${PTEST_PATH}/testrunners |
| 85 | for f in ${D}${PTEST_PATH}/bin/*-testrunner; do | ||
| 86 | echo `basename $f` >> ${D}${PTEST_PATH}/testrunners | ||
| 87 | done | ||
| 88 | install -Dm 0644 ${S}/cppignore.lnx ${D}${PTEST_PATH}/cppignore.lnx | ||
| 88 | } | 89 | } |
| 89 | 90 | ||
| 90 | PACKAGES_DYNAMIC = "poco-.*" | 91 | PACKAGES_DYNAMIC = "poco-.*" |
