diff mbox series

[meta-oe] sdbus-c++: Fix build and upgrade to latest git

Message ID 20240420012107.1957858-1-raj.khem@gmail.com
State New
Headers show
Series [meta-oe] sdbus-c++: Fix build and upgrade to latest git | expand

Commit Message

Khem Raj April 20, 2024, 1:21 a.m. UTC 
Fix ptest run while here

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../sdbus-c++/sdbus-c++-1.5.0/run-ptest           | 15 ---------------
 .../recipes-core/sdbus-c++/sdbus-c++/run-ptest    |  6 ++++++
 meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.5.0.bb | 10 +++++-----
 3 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100755 meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.5.0/run-ptest
 create mode 100755 meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest
diff mbox series

Patch

diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.5.0/run-ptest b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.5.0/run-ptest
deleted file mode 100755
index 2dc6e1eca1..0000000000
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.5.0/run-ptest
+++ /dev/null
@@ -1,15 +0,0 @@ 
-#!/bin/sh
-set -e
-set -o pipefail
-
-SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-
-${SCRIPTPATH}/sdbus-c++-unit-tests 2>&1 | \
-sed -r 's/^\[\s+OK\s+\] (.*) \([0-9]+\sms\)$/OK: \1 /' | \
-sed -r 's/^\[\s+FAILED\s+\] (.*) \([0-9]+\sms\)$/FAILED: \1 /' | \
-awk '{if ($1 == "OK:" || $1 == "FAILED:") {print $0}}'
-
-${SCRIPTPATH}/sdbus-c++-integration-tests 2>&1 | \
-sed -r 's/^\[\s+OK\s+\] (.*) \([0-9]+\sms\)$/OK: \1 /' | \
-sed -r 's/^\[\s+FAILED\s+\] (.*) \([0-9]+\sms\)$/FAILED: \1 /' | \
-awk '{if ($1 == "OK:" || $1 == "FAILED:") {print $0}}' 
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest b/meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest
new file mode 100755
index 0000000000..5e285b39e0
--- /dev/null
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest
@@ -0,0 +1,6 @@ 
+#!/bin/sh
+set -e
+
+./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-core/sdbus-c++/sdbus-c++_1.5.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.5.0.bb
index f52ba141e1..5422e08dd1 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.5.0.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.5.0.bb
@@ -12,14 +12,14 @@  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-exte
                    ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}"
 PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu"
 PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd"
-PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${PTEST_PATH},-DBUILD_TESTS=OFF,googletest gmock"
+PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DTESTS_INSTALL_PATH=${PTEST_PATH},-DBUILD_TESTS=OFF,googletest gmock"
 
 DEPENDS += "expat"
 
-SRCREV = "30d9f1d46258c2be4ce29b7f7f168ecdf6d4f328"
-
-SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master"
-SRC_URI += "file://run-ptest"
+PV .= "+git"
+SRCREV = "334fcb8833afb298270531dde369135e4b5b88fd"
+SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \
+           file://run-ptest"
 
 EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \
                  -DBUILD_DOC=ON \