diff mbox series

[2/2] coreutils: fix help-version.sh ptest with 'single-binary' enabled

Message ID 20250508072814.106107-2-ovidiu.panait@windriver.com
State New
Headers show
Series [1/2] coreutils: fix ptest build error with single-binary | expand

Commit Message

Ovidiu Panait May 8, 2025, 7:28 a.m. UTC 
From: Ovidiu Panait <ovidiu.panait@windriver.com>

If 'single-binary' PACKAGECONFIG is enabled, help-version.sh ptest fails:
FAIL: tests/help/help-version
=============================

ginstall: missing file operand
Try 'ginstall --help' for more information.
FAIL: ginstall
FAIL tests/help/help-version.sh (exit status: 1)

The tescase expects 'single_binary_progs' variable to contain an 'install'
entry, rather than 'ginstall', so update the Makefile in coreutils-ptest to
reflect this. Note that this is already handled in the non single-binary case
with a similar sed command.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
 meta/recipes-core/coreutils/coreutils_9.6.bb | 2 ++
 1 file changed, 2 insertions(+)

Comments

Randy MacLeod May 12, 2025, 6 p.m. UTC | #1 
On 2025-05-08 3:28 a.m., Ovidiu Panait via lists.openembedded.org wrote:
> From: Ovidiu Panait<ovidiu.panait@windriver.com>
>
> If 'single-binary' PACKAGECONFIG is enabled, help-version.sh ptest fails:
> FAIL: tests/help/help-version
> =============================
>
> ginstall: missing file operand
> Try 'ginstall --help' for more information.
> FAIL: ginstall
> FAIL tests/help/help-version.sh (exit status: 1)


Why does this only fail in the single binary case?

Can this be fixed at configure time to use 'install' rather than, 
'ginstall'.

Can this be fixed upstream?


../Randy


>
> The tescase expects 'single_binary_progs' variable to contain an 'install'
> entry, rather than 'ginstall', so update the Makefile in coreutils-ptest to
> reflect this. Note that this is already handled in the non single-binary case
> with a similar sed command.
>
> Signed-off-by: Ovidiu Panait<ovidiu.panait@windriver.com>
> ---
>   meta/recipes-core/coreutils/coreutils_9.6.bb | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/meta/recipes-core/coreutils/coreutils_9.6.bb b/meta/recipes-core/coreutils/coreutils_9.6.bb
> index fe2cf73d40..a95644d22d 100644
> --- a/meta/recipes-core/coreutils/coreutils_9.6.bb
> +++ b/meta/recipes-core/coreutils/coreutils_9.6.bb
> @@ -220,6 +220,8 @@ do_install_ptest () {
>           find "${D}${PTEST_PATH}/src" -type f -exec \
>               sed -i -e 's:${B}/src/coreutils:/usr/bin/env -S coreutils:g' \
>               {} +
> +
> +        sed -i '/^single_binary_progs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile
>       fi
>   }
>
> --
> 2.34.1
>
> pLK@tY:ATbOf1"dW
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#216143):https://lists.openembedded.org/g/openembedded-core/message/216143
> Mute This Topic:https://lists.openembedded.org/mt/112783420/3616765
> Group Owner:openembedded-core+owner@lists.openembedded.org
> Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub [randy.macleod@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-core/coreutils/coreutils_9.6.bb b/meta/recipes-core/coreutils/coreutils_9.6.bb
index fe2cf73d40..a95644d22d 100644
--- a/meta/recipes-core/coreutils/coreutils_9.6.bb
+++ b/meta/recipes-core/coreutils/coreutils_9.6.bb
@@ -220,6 +220,8 @@  do_install_ptest () {
         find "${D}${PTEST_PATH}/src" -type f -exec \
             sed -i -e 's:${B}/src/coreutils:/usr/bin/env -S coreutils:g' \
             {} +
+
+        sed -i '/^single_binary_progs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile
     fi
 }