diff options
Diffstat (limited to 'meta-oe')
-rwxr-xr-x | meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.5.0/run-ptest | 15 | ||||
-rwxr-xr-x | meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest | 6 | ||||
-rw-r--r-- | meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.5.0.bb | 10 |
3 files changed, 11 insertions, 20 deletions
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 2dc6e1eca..000000000 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.5.0/run-ptest +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | set -e | ||
3 | set -o pipefail | ||
4 | |||
5 | SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" | ||
6 | |||
7 | ${SCRIPTPATH}/sdbus-c++-unit-tests 2>&1 | \ | ||
8 | sed -r 's/^\[\s+OK\s+\] (.*) \([0-9]+\sms\)$/OK: \1 /' | \ | ||
9 | sed -r 's/^\[\s+FAILED\s+\] (.*) \([0-9]+\sms\)$/FAILED: \1 /' | \ | ||
10 | awk '{if ($1 == "OK:" || $1 == "FAILED:") {print $0}}' | ||
11 | |||
12 | ${SCRIPTPATH}/sdbus-c++-integration-tests 2>&1 | \ | ||
13 | sed -r 's/^\[\s+OK\s+\] (.*) \([0-9]+\sms\)$/OK: \1 /' | \ | ||
14 | sed -r 's/^\[\s+FAILED\s+\] (.*) \([0-9]+\sms\)$/FAILED: \1 /' | \ | ||
15 | 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 000000000..5e285b39e --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++/run-ptest | |||
@@ -0,0 +1,6 @@ | |||
1 | #!/bin/sh | ||
2 | set -e | ||
3 | |||
4 | ./sdbus-c++-unit-tests 2>&1 && echo "PASS: sdbus-c++-unit-tests" || echo "FAIL: sdbus-c++-unit-tests" | ||
5 | |||
6 | ./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 f52ba141e..5422e08dd 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 | |||
12 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" | 12 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" |
13 | PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu" | 13 | PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu" |
14 | PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" | 14 | PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" |
15 | PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${PTEST_PATH},-DBUILD_TESTS=OFF,googletest gmock" | 15 | PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DTESTS_INSTALL_PATH=${PTEST_PATH},-DBUILD_TESTS=OFF,googletest gmock" |
16 | 16 | ||
17 | DEPENDS += "expat" | 17 | DEPENDS += "expat" |
18 | 18 | ||
19 | SRCREV = "30d9f1d46258c2be4ce29b7f7f168ecdf6d4f328" | 19 | PV .= "+git" |
20 | 20 | SRCREV = "334fcb8833afb298270531dde369135e4b5b88fd" | |
21 | SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" | 21 | SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \ |
22 | SRC_URI += "file://run-ptest" | 22 | file://run-ptest" |
23 | 23 | ||
24 | EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \ | 24 | EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \ |
25 | -DBUILD_DOC=ON \ | 25 | -DBUILD_DOC=ON \ |