package/ltp-testsuite: Replace libtirpc patch with simple removing files
PATCH 1/1 package/ltp-testsuite: Replace libtirpc patch with simple removing files
We delete files anyway, so let's use this way instead of applying patch.
Since libtirpc update to 1.2.5 commit message in patch was wrong anyway (libtirpc patch 0005-Disable-DES-authentification-support.patch was replaced by upstream solution).
NOTE: upstream will probably delete these tests anyway [1], but even if it does until next LTP release it's IMHO better to remove files instead backporting it.
[1] https://lists.linux.it/pipermail/ltp/2019-December/014856.html
--- ...ble-tirpc_auth_authdes_-create-tests.patch | 36 ------------------- package/ltp-testsuite/ltp-testsuite.mk | 12 ++++--- 2 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 package/ltp-testsuite/0001-rpc-tirpc-disable-tirpc_auth_authdes_-create-tests.patch
package/ltp-testsuite/0001-rpc-tirpc-disable-tirpc_auth_authdes_-create-tests.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 9bbadb7ece1b068465279e7248b3439d443054a6 Mon Sep 17 00:00:00 2001 -From: Erico Nunes <[email protected]> -Date: Fri, 30 Sep 2016 17:43:08 +0200 -Subject: [PATCH] rpc-tirpc: disable tirpc_auth_authdes_*create tests - -Due to Buildroot patch 0005-Disable-DES-authentification-support.patch on -libtirpc, this library is built without method authdes_create. Any code -that uses this library, like the rpc-tirpc testsuite, thus fails to link. - -In the context of Buildroot, instead of disabling ltp-testsuite entirely, -just disable the problematic tests. - -Upstream-status: not applicable -Signed-off-by: Thomas De Schampheleire <[email protected]> -[Erico: Rebase for ltp 20160920] -Signed-off-by: Erico Nunes <[email protected]> ---- - testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile -index 45bc8a6..c04a088 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile -@@ -19,4 +19,8 @@ - top_srcdir ?= ../../../../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+FILTER_OUT_DIRS += tirpc_auth_authdes_seccreate \ -+ tirpc_auth_authdes_create -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk --- -2.7.4 -
package/ltp-testsuite/ltp-testsuite.mk +8 -4
@@ -62,13 +62,18 @@ LTP_TESTSUITE_CONF_ENV += \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" +# libtirpc 1.2.5 has by default authdes disabled +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ + testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authdes_create/ \ + testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authdes_seccreate/ + # uclibc: bessel support normally not enabled ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES += \ testcases/misc/math/float/bessel/ \ - testcases/misc/math/float/float_bessel.c + testcases/misc/math/float/float_bessel.c \ else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES += \ testcases/kernel/pty/pty01.c \ testcases/kernel/pty/pty02.c \ testcases/kernel/pty/ptem01.c \
@@ -97,7 +102,6 @@ LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_regunreg_svc_unregister/ \ testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_regunreg_xprt_register/ \ testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_regunreg_xprt_unregister/ \ - testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authdes_seccreate/ \ utils/benchmark/ebizzy-0.3 endif
Signature · 1 line
2.24.0
PATCH 1/1 package/ltp-testsuite: Replace libtirpc patch with simple removing files
Petr, All,
On 2019-12-30 21:27 +0100, Petr Vorel spake thusly:
Quoted 1 line
We delete files anyway, so let's use this way instead of applying patch.
No, we prefer patches over hooks, and we've in the past replaced hooks that tweak/remove files with patches with the same effect.
Besides, I'm pretty sure your patch is wrong, see below...
Quoted 3 lines
Since libtirpc update to 1.2.5 commit message in patch was wrong anyway (libtirpc patch 0005-Disable-DES-authentification-support.patch was replaced by upstream solution).
Then it is better to fix the description of the patch.
[--SNIP--]
Quoted 10 lines
package/ltp-testsuite/ltp-testsuite.mk +2
-0@@ -62,13 +62,18 @@ LTP_TESTSUITE_CONF_ENV += \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" +# libtirpc 1.2.5 has by default authdes disabled +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \
package/ltp-testsuite/ltp-testsuite.mk LTP_TESTSUITE_CONF_ENV += \ · line 74
Quoted 10 lines
package/ltp-testsuite/ltp-testsuite.mk +5
-2+ testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authdes_create/ \ + testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authdes_seccreate/ + # uclibc: bessel support normally not enabled ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES += \ testcases/misc/math/float/bessel/ \ - testcases/misc/math/float/float_bessel.c + testcases/misc/math/float/float_bessel.c \
I doubt this trailiing '\' is correct, or it would add the next line to the definition, and thus the line:
package/ltp-testsuite/ltp-testsuite.mk LTP_TESTSUITE_CONF_ENV += \ · line 75
Quoted 1 line
package/ltp-testsuite/ltp-testsuite.mk +0
-0else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
would not be treated as Makefile code, but as part of the variable LTP_TESTSUITE_UNSUPPORTED_TEST_CASES.
Sorry, I've marked your patch as rejected.
Regards,
Yann E. MORIN.
Quoted 20 lines
package/ltp-testsuite/ltp-testsuite.mk +1
-2-LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ +LTP_TESTSUITE_UNSUPPORTED_TEST_CASES += \ testcases/kernel/pty/pty01.c \ testcases/kernel/pty/pty02.c \ testcases/kernel/pty/ptem01.c \@@ -97,7 +102,6 @@ LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_regunreg_svc_unregister/ \ testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_regunreg_xprt_register/ \ testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_regunreg_xprt_unregister/ \ - testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authdes_seccreate/ \ utils/benchmark/ebizzy-0.3 endifSignature · 6 lines
2.24.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 package/ltp-testsuite: Replace libtirpc patch with simple removing files
Hi Yann,
Quoted 5 lines
On 2019-12-30 21:27 +0100, Petr Vorel spake thusly:
Quoted 1 line
We delete files anyway, so let's use this way instead of applying patch.
No, we prefer patches over hooks, and we've in the past replaced hooks that tweak/remove files with patches with the same effect.
Thanks for review and explain the policy.
Quoted 1 line
Besides, I'm pretty sure your patch is wrong, see below...
You right, I'm sorry to sent wrong patch.
I usually run validate patch, this time I didn't check. I'll be careful next time.
Quoted 5 lines
Quoted 3 lines
Since libtirpc update to 1.2.5 commit message in patch was wrong anyway (libtirpc patch 0005-Disable-DES-authentification-support.patch was replaced by upstream solution).
Then it is better to fix the description of the patch.
Sure. I'll wait whether upstream patch is accepted (if yes, I'll replace patch, otherwise I fix the description).
Kind regards,
Petr