Hi, Armin
Could you please cherry-pick these 2 patch into branch scarthgap? I have
tried that it can be picked successfully, and compile successfully, Thanks
Regards
Changqing
On 10/10/24 14:35, Yu, Mingli via lists.openembedded.org wrote:
From: Mingli Yu<[email protected]>
# ./run-ptest
PASS: address
PASS: address_v4
PASS: address_v4_iterator
PASS: address_v4_range
PASS: address_v6
PASS: address_v6_iterator
PASS: address_v6_range
PASS: any_completion_executor
PASS: any_completion_handler
PASS: any_executor
PASS: any_io_executor
PASS: append
PASS: as_tuple
PASS: associated_allocator
PASS: associated_cancellation_slot
PASS: associated_executor
PASS: associated_immediate_executor
PASS: associator
PASS: async_result
[snip]
Signed-off-by: Mingli Yu<[email protected]>
---
...tests-Remove-blocking_adaptation.cpp.patch | 37 +++++++++++++++++++
meta-oe/recipes-support/asio/asio/run-ptest | 19 ++++++++++
meta-oe/recipes-support/asio/asio_1.30.2.bb | 19 +++++++++-
3 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644
meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
create mode 100644 meta-oe/recipes-support/asio/asio/run-ptest
diff --git
a/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
b/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
new file mode 100644
index 000000000..5aa502916
--- /dev/null
+++
b/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
@@ -0,0 +1,37 @@
+From 7d76513b82a67e117d195a1b5a0d6c2e8591488b Mon Sep 17 00:00:00 2001
+From: Mingli Yu<[email protected]>
+Date: Thu, 10 Oct 2024 13:58:38 +0800
+Subject: [PATCH] tests: Remove blocking_adaptation.cpp
+
+The test failed to build with clang as below.
+../../../asio-1.30.2/src/tests/../../include/asio/execution/blocking_adaptation.hpp:216:13:
error: call to 'query' is ambiguous
+ 216 | conditional_t<true, T, P>::query(static_cast<P&&>(p))
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../../asio-1.30.2/src/tests/../../include/asio/execution/blocking_adaptation.hpp:213:29:
note: in instantiation of exception specification for
'query<asio::execution::detail::blocking_adaptation::allowed_t<>>' requested
here
+ 213 | static constexpr auto query(P&& p)
+ |
+
+We can add the case back once the above build failure resolved then.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu<[email protected]>
+---
+ src/tests/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
+index 04f8a03..eab2d56 100644
+--- a/src/tests/Makefile.am
++++ b/src/tests/Makefile.am
+@@ -68,7 +68,6 @@ check_PROGRAMS = \
+ unit/error \
+ unit/execution/any_executor \
+ unit/execution/blocking \
+- unit/execution/blocking_adaptation \
+ unit/execution/context_as \
+ unit/execution/executor \
+ unit/execution/invocable_archetype \
+--
+2.34.1
+
diff --git a/meta-oe/recipes-support/asio/asio/run-ptest
b/meta-oe/recipes-support/asio/asio/run-ptest
new file mode 100644
index 000000000..d37db0b31
--- /dev/null
+++ b/meta-oe/recipes-support/asio/asio/run-ptest
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+ptestdir=$(dirname "$(readlink -f "$0")")
+cd "$ptestdir"/tests || exit
+
+tests=$(find * -type f -executable)
+
+rm -rf test.log
+
+for f in $tests
+do
+ if test -x ./"$f"; then
+ if ./"$f" > test.log 2>&1; then
+ echo "PASS: $f"
+ else
+ echo "FAIL: $f"
+ fi
+ fi
+done
diff --git a/meta-oe/recipes-support/asio/asio_1.30.2.bb
b/meta-oe/recipes-support/asio/asio_1.30.2.bb
index 6930381ec..1f492b71e 100644
--- a/meta-oe/recipes-support/asio/asio_1.30.2.bb
+++ b/meta-oe/recipes-support/asio/asio_1.30.2.bb
@@ -8,9 +8,12 @@ LICENSE = "BSL-1.0"
DEPENDS = "openssl"
-SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2 \
+file://0001-tests-Remove-blocking_adaptation.cpp.patch \
+file://run-ptest \
+"
-inherit autotools
+inherit autotools ptest
ALLOW_EMPTY:${PN} = "1"
@@ -22,4 +25,16 @@ PACKAGECONFIG ??= "boost"
PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost"
+TESTDIR = "src/tests"
+do_compile_ptest() {
+ echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile
+ oe_runmake -C ${TESTDIR} buildtest-TESTS
+}
+
+do_install_ptest() {
+ install -d ${D}${PTEST_PATH}/tests
+ # copy executables
+ find ${B}/${TESTDIR}/unit -type f -executable -exec cp {}
${D}${PTEST_PATH}/tests/ \;
+}
+
BBCLASSEXTEND = "native nativesdk"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#114550):
https://lists.openembedded.org/g/openembedded-devel/message/114550
Mute This Topic: https://lists.openembedded.org/mt/108924492/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
