@@ -1,33 +1,26 @@
Remove tmpdir from apptest binary
-This binary is used in the ptest package. It executes another helper binary
-for the test, which is identified by its absolute path, as it was determined during
-build. To avoid the QA error (and to find the helper binary during test excution),
-use pwd command files.
+The AppTest binary is used in the ptest package. It spawns two helper binaries
+(ensure_utf8 / ensure_utf8_twice) which upstream identifies by the absolute
+path in the build tree via $<TARGET_FILE:...>. That absolute path both trips
+the buildpaths QA check and does not exist on the target. Refer to the helpers
+relative to the current directory instead - run-ptest chdir()s into the tests
+directory the helpers are installed into.
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
-diff --git a/tests/AppTest.cpp b/tests/AppTest.cpp
-index 29aff27c..ddb8238b 100644
---- a/tests/AppTest.cpp
-+++ b/tests/AppTest.cpp
-@@ -2819,7 +2819,7 @@ TEST_CASE("C20_compile", "simple") {
-
- // #845
- TEST_CASE("Ensure UTF-8", "[app]") {
-- const char *commandline = CLI11_ENSURE_UTF8_EXE " 1234 false \"hello world\"";
-+ const char *commandline = "$(pwd)/ensure_utf8 1234 false \"hello world\"";
- int retval = std::system(commandline);
-
- if(retval == -1) {
-@@ -2837,7 +2837,7 @@ TEST_CASE("Ensure UTF-8", "[app]") {
-
- // #845
- TEST_CASE("Ensure UTF-8 called twice", "[app]") {
-- const char *commandline = CLI11_ENSURE_UTF8_TWICE_EXE " 1234 false \"hello world\"";
-+ const char *commandline = "$(pwd)/ensure_utf8_twice 1234 false \"hello world\"";
- int retval = std::system(commandline);
-
- if(retval == -1) {
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -159,8 +159,7 @@ endforeach()
+ function(add_dependent_application_definitions TARGET)
+ foreach(APP IN LISTS CLI11_DEPENDENT_APPLICATIONS)
+ string(TOUPPER ${APP} APP_UPPERCASE)
+- target_compile_definitions(${TARGET}
+- PRIVATE CLI11_${APP_UPPERCASE}_EXE="$<TARGET_FILE:${APP}>")
++ target_compile_definitions(${TARGET} PRIVATE CLI11_${APP_UPPERCASE}_EXE="./${APP}")
+
+ if(WIN32)
+ target_link_libraries(${APP} PRIVATE shell32)
similarity index 88%
rename from meta-oe/recipes-support/cli11/cli11_2.6.1.bb
rename to meta-oe/recipes-support/cli11/cli11_2.7.2.bb
@@ -1,14 +1,14 @@
DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface."
HOMEPAGE = "https://github.com/CLIUtils/CLI11"
LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=27559a6fd853c4b46ec4dea16597460c"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=744e78b25a90f01b35b087d9fb985ed4"
DEPENDS = "catch2"
SRC_URI = "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https;tag=v${PV} \
file://remove_tmpdir_from_test_binary.patch \
file://run-ptest"
-SRCREV = "bfffd37e1f804ca4fae1caae106935791696b6a9"
+SRCREV = "919ce47dad39520a6e9a695d3e2d222c6920a445"
inherit cmake ptest
Point release. LIC_FILES_CHKSUM md5 updated for the LICENSE file whose copyright header now says 2017-2026 instead of 2017-2025; license text unchanged. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> --- .../remove_tmpdir_from_test_binary.patch | 45 ++++++++----------- .../cli11/{cli11_2.6.1.bb => cli11_2.7.2.bb} | 4 +- 2 files changed, 21 insertions(+), 28 deletions(-) rename meta-oe/recipes-support/cli11/{cli11_2.6.1.bb => cli11_2.7.2.bb} (88%)