7 files changed, 44 insertions, 51 deletions

diff --git a/meta-oe/recipes-core/libxml/libxml++-5.0/run-ptest b/meta-oe/recipes-core/libxml/libxml++-5.0/run-ptest
new file mode 100644
index 0000000000..4f54f90e09
--- /dev/null
+++ b/meta-oe/recipes-core/libxml/libxml++-5.0/run-ptest
@@ -0,0 +1,4 @@
+#!/bin/sh
+for t in `ls ./*_test`; do
+        $t && echo PASS: $t || echo FAIL: $t
+done
diff --git a/meta-oe/recipes-core/libxml/libxml++-5.0_5.4.0.bb b/meta-oe/recipes-core/libxml/libxml++-5.0_5.4.0.bb
index e4fdac2c2c..cd16ec862f 100644
--- a/meta-oe/recipes-core/libxml/libxml++-5.0_5.4.0.bb
+++ b/meta-oe/recipes-core/libxml/libxml++-5.0_5.4.0.bb
@@ -11,11 +11,21 @@ DEPENDS = "libxml2 glibmm"
 GNOMEBN = "libxml++"
 inherit gnomebase ptest
 
+SRC_URI += "file://run-ptest"
 S = "${UNPACKDIR}/libxml++-${PV}"
 
 SRC_URI[archive.sha256sum] = "e9a23c436686a94698d2138e6bcbaf849121d63bfa0f50dc34fefbfd79566848"
 
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
+PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+PACKAGECONFIG[tests] = "-Dbuild-tests=true, -Dbuild-tests=false"
+
+do_install_ptest(){
+        for t in `ls ${B}/tests/*_test`; do
+                install $t ${D}${PTEST_PATH}/
+        done
+}
+
 FILES:${PN}-doc += "${datadir}/devhelp"
 FILES:${PN}-dev += "${libdir}/libxml++-${@gnome_verdir("${PV}")}/include/libxml++config.h"
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest b/meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest
index 5e285b39e0..845ba7d8c6 100755
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+# the integration tests require some machine id
+if [ ! -f /etc/machine-id ]; then
+  echo 12345678901234567890123456789012 > /etc/machine-id
+fi
+
 ./sdbus-c++-unit-tests 2>&1 && echo "PASS: sdbus-c++-unit-tests" || echo "FAIL: sdbus-c++-unit-tests"
 
 ./sdbus-c++-integration-tests 2>&1 && echo "PASS: sdbus-c++-integration-tests" || echo "FAIL: sdbus-c++-integration-tests"
diff --git a/meta-oe/recipes-support/libmanette/libmanette/run-ptest b/meta-oe/recipes-support/libmanette/libmanette/run-ptest
new file mode 100644
index 0000000000..3c937825d1
--- /dev/null
+++ b/meta-oe/recipes-support/libmanette/libmanette/run-ptest
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ -d /usr/libexec/installed-tests/manette-0.2 ]; then
+        cd /usr/libexec/installed-tests/manette-0.2
+        for t in ./*; do
+                $t && echo PASS: $t || echo FAIL: $t
+        done
+        cd -
+else
+        echo FAIL: no tests found
+fi
diff --git a/meta-oe/recipes-support/libmanette/libmanette_0.2.13.bb b/meta-oe/recipes-support/libmanette/libmanette_0.2.13.bb
index 2825b8af98..ce12760f54 100644
--- a/meta-oe/recipes-support/libmanette/libmanette_0.2.13.bb
+++ b/meta-oe/recipes-support/libmanette/libmanette_0.2.13.bb
@@ -7,10 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 DEPENDS = "libevdev libgudev hidapi"
 
-SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz"
+SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz \
+           file://run-ptest"
 SRC_URI[sha256sum] = "287cc2fde0de092919366af757d85e7b3a0248eb1b395344726e97955a77d8ae"
 
 inherit meson pkgconfig gobject-introspection ptest vala
 
-FILES:${PN}-ptest =+ "${bindir}/manette-test"
 FILES:${PN}-dev =+ "${libdir}/girepository-1.0"
+FILES:${PN}-ptest += "${libexecdir}/installed-tests"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'test', '', d)}"
+PACKAGECONFIG[test] = "-Dbuild-tests=true -Dinstall-tests=true,-Dbuild-tests=false -Dinstall-tests=false"
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 "<unknown>", line -1
-   2: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testFullPKCS12
-  │ │ "N4Poco17NotFoundExceptionE:
-  Not found: POCO_BASE"
-  │ │ in "<unknown>", line -1
-   3: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testCertsOnlyPKCS12
-  │ │ "N4Poco17NotFoundExceptionE:
-  Not found: POCO_BASE"
-  │ │ in "<unknown>", line -1
-   4: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testPEMReadWrite
-  │ │ "N4Poco17NotFoundExceptionE:
-  Not found: POCO_BASE"
-  │ │ in "<unknown>", line -1
-
-There was 1 error:
- 1: CppUnit::TestCaller<ProcessRunnerTest>.testProcessRunner
-    "Poco::TimeoutException:
-Timeout: ProcessRunner::checkTimeout(): waiting for PID file"
-    in "<unknown>", line -1
-
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com>
 Signed-off-by: Peter Marko <peter.marko@siemens.com>
+
+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<HTTPSClientSessionTest>.testProxy
+@@ -30,3 +30,4 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy
  CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy
  CppUnit::TestCaller<DNSTest>.testHostByAddress
  CppUnit::TestCaller<DNSTest>.testHostByName
-+CppUnit::TestCaller<ProcessTest>.testLaunch
-+CppUnit::TestCaller<ProcessTest>.testLaunchRedirectIn
-+CppUnit::TestCaller<ProcessTest>.testLaunchRedirectOut
-+CppUnit::TestCaller<ProcessTest>.testLaunchEnv
-+CppUnit::TestCaller<EVPTest>.testRSAEVPKeyFromPKCS12
-+CppUnit::TestCaller<PKCS12ContainerTest>.testFullPKCS12
-+CppUnit::TestCaller<PKCS12ContainerTest>.testCertsOnlyPKCS12
-+CppUnit::TestCaller<PKCS12ContainerTest>.testPEMReadWrite
 +CppUnit::TestCaller<MongoDBTest>.testArray
-+CppUnit::TestCaller<ProcessRunnerTest>.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)}"