summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/poco/poco/run-ptest2
-rw-r--r--meta-oe/recipes-support/poco/poco_1.12.4.bb9
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
8done < testrunners 8done < testrunners
diff --git a/meta-oe/recipes-support/poco/poco_1.12.4.bb b/meta-oe/recipes-support/poco/poco_1.12.4.bb
index 51bd5611fb..47dac1a89e 100644
--- a/meta-oe/recipes-support/poco/poco_1.12.4.bb
+++ b/meta-oe/recipes-support/poco/poco_1.12.4.bb
@@ -72,17 +72,14 @@ python populate_packages:prepend () {
72 poco_libdir = d.expand('${libdir}') 72 poco_libdir = d.expand('${libdir}')
73 pn = d.getVar("PN") 73 pn = d.getVar("PN")
74 packages = [] 74 packages = []
75 testrunners = []
76 75
77 def hook(f, pkg, file_regex, output_pattern, modulename): 76 def hook(f, pkg, file_regex, output_pattern, modulename):
78 packages.append(pkg) 77 packages.append(pkg)
79 testrunners.append(modulename)
80 78
81 do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$', 79 do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$',
82 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) 80 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook)
83 81
84 d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) 82 d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages))
85 d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners))
86} 83}
87 84
88do_install_ptest () { 85do_install_ptest () {
@@ -90,7 +87,11 @@ do_install_ptest () {
90 cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} 87 cp -f ${B}/lib/libCppUnit.so* ${D}${libdir}
91 cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ 88 cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/
92 find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; 89 find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \;
93 echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" 90 rm -f ${D}${PTEST_PATH}/testrunners
91 for f in ${D}${PTEST_PATH}/bin/*-testrunner; do
92 echo `basename $f` >> ${D}${PTEST_PATH}/testrunners
93 done
94 install -Dm 0644 ${S}/cppignore.lnx ${D}${PTEST_PATH}/cppignore.lnx
94} 95}
95 96
96PACKAGES_DYNAMIC = "poco-.*" 97PACKAGES_DYNAMIC = "poco-.*"