diff --git a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch index 1d4eb9b831..8575797e89 100644 --- a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch +++ b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch @@ -8,48 +8,14 @@ Content-Transfer-Encoding: 8bit These tests fail on Linux -There were 4 failures: - 1: N7CppUnit10TestCallerI11ProcessTestEE.testLaunch - "rc == 3" - in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 79 - 2: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectIn - "rc == 100" - in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 106 - 3: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectOut - "s == "Hello, world!"" - in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 134 - 4: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchEnv - "s == "test"" - in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 166 - - There were 4 errors:- - 1: N7CppUnit10TestCallerI7EVPTestEE.testRSAEVPKeyFromPKCS12 - │ │ "N4Poco17NotFoundExceptionE: - Not found: POCO_BASE" - │ │ in "", line -1 - 2: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testFullPKCS12 - │ │ "N4Poco17NotFoundExceptionE: - Not found: POCO_BASE" - │ │ in "", line -1 - 3: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testCertsOnlyPKCS12 - │ │ "N4Poco17NotFoundExceptionE: - Not found: POCO_BASE" - │ │ in "", line -1 - 4: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testPEMReadWrite - │ │ "N4Poco17NotFoundExceptionE: - Not found: POCO_BASE" - │ │ in "", line -1 - -There was 1 error: - 1: CppUnit::TestCaller.testProcessRunner - "Poco::TimeoutException: -Timeout: ProcessRunner::checkTimeout(): waiting for PID file" - in "", line -1 - Upstream-Status: Inappropriate [OE specific] Signed-off-by: Khem Raj Signed-off-by: Patrick Wicki Signed-off-by: Peter Marko + +Updated comment and content after fixing some tests. +Left only MongoDBTest.testArray on ignore list, untested. + --- cppignore.lnx | 9 +++++++++ 1 file changed, 9 insertions(+) @@ -58,17 +24,8 @@ diff --git a/cppignore.lnx b/cppignore.lnx index b3288d474..9aad48ca5 100644 --- a/cppignore.lnx +++ b/cppignore.lnx -@@ -30,3 +30,13 @@ CppUnit::TestCaller.testProxy +@@ -30,3 +30,4 @@ CppUnit::TestCaller.testProxy CppUnit::TestCaller.testProxy CppUnit::TestCaller.testHostByAddress CppUnit::TestCaller.testHostByName -+CppUnit::TestCaller.testLaunch -+CppUnit::TestCaller.testLaunchRedirectIn -+CppUnit::TestCaller.testLaunchRedirectOut -+CppUnit::TestCaller.testLaunchEnv -+CppUnit::TestCaller.testRSAEVPKeyFromPKCS12 -+CppUnit::TestCaller.testFullPKCS12 -+CppUnit::TestCaller.testCertsOnlyPKCS12 -+CppUnit::TestCaller.testPEMReadWrite +CppUnit::TestCaller.testArray -+CppUnit::TestCaller.testProcessRunner diff --git a/meta-oe/recipes-support/poco/poco_1.14.2.bb b/meta-oe/recipes-support/poco/poco_1.14.2.bb index 9cdc9e325c..8f81fac77b 100644 --- a/meta-oe/recipes-support/poco/poco_1.14.2.bb +++ b/meta-oe/recipes-support/poco/poco_1.14.2.bb @@ -108,13 +108,15 @@ do_install_ptest () { if ${@bb.utils.contains('PACKAGECONFIG', 'DataPostgreSQL', 'true', 'false', d)}; then cp -f ${B}/lib/libPocoDataTest.so* ${D}${libdir} fi - cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ + cp -rf ${S}/*/testsuite/data ${D}${PTEST_PATH}/bin/ find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; rm -f ${D}${PTEST_PATH}/testrunners for f in ${D}${PTEST_PATH}/bin/*-testrunner; do echo `basename $f` >> ${D}${PTEST_PATH}/testrunners done install -Dm 0644 ${S}/cppignore.lnx ${D}${PTEST_PATH}/cppignore.lnx + install ${B}/bin/TestLibrary.so ${D}${libdir} + install -D ${B}/bin/TestApp ${D}${bindir}/TestApp } PACKAGES_DYNAMIC = "poco-.*" @@ -128,6 +130,7 @@ FILES:${PN}-cppunit += "${libdir}/libCppUnit.so*" ALLOW_EMPTY:${PN}-cppunit = "1" FILES:${PN}-datatest += "${libdir}/libPocoDataTest.so*" ALLOW_EMPTY:${PN}-datatest = "1" +FILES:${PN}-ptest += "${bindir}/TestApp ${libdir}/TestLibrary.so" RDEPENDS:${PN}-ptest += "${PN}-cppunit ${PN}-datatest" RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PACKAGECONFIG', 'MongoDB', 'mongodb', '', d)}"