diff mbox series

selftests/arm64: Fix mismerge of Makefile for fp tests

Message ID 20220524151454.1487390-1-broonie@kernel.org
State New
Headers show
Series selftests/arm64: Fix mismerge of Makefile for fp tests | expand

Commit Message

Mark Brown May 24, 2022, 3:14 p.m. UTC
The FP Makefile defines two TEST_PROGS_EXTENDED instead of one of them and one
one TEST_GEN_PROGS_EXTENDED for the programs that need compilation. Fix
that.

Fixes: a59f7a7f76407da78 ("selftests/arm64: Use TEST_GEN_PROGS_EXTENDED in the FP Makefile")
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 tools/testing/selftests/arm64/fp/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Catalin Marinas June 2, 2022, 7:43 p.m. UTC | #1
On Tue, May 24, 2022 at 04:14:54PM +0100, Mark Brown wrote:
> The FP Makefile defines two TEST_PROGS_EXTENDED instead of one of them and one
> one TEST_GEN_PROGS_EXTENDED for the programs that need compilation. Fix
> that.
> 
> Fixes: a59f7a7f76407da78 ("selftests/arm64: Use TEST_GEN_PROGS_EXTENDED in the FP Makefile")
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
>  tools/testing/selftests/arm64/fp/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/arm64/fp/Makefile b/tools/testing/selftests/arm64/fp/Makefile
> index a41fef2c9669..36db61358ed5 100644
> --- a/tools/testing/selftests/arm64/fp/Makefile
> +++ b/tools/testing/selftests/arm64/fp/Makefile
> @@ -9,7 +9,7 @@ TEST_GEN_PROGS := fp-stress \
>  	sve-ptrace sve-probe-vls \
>  	vec-syscfg \
>  	za-fork za-ptrace
> -TEST_PROGS_EXTENDED := fp-pidbench fpsimd-test \
> +TEST_GEN_PROGS_EXTENDED := fp-pidbench fpsimd-test \
>  	rdvl-sme rdvl-sve \
>  	sve-test \
>  	ssve-test \

Do we still need this? The fixed commit already uses
TEST_GEN_PROGS_EXTENDED and that's what it seems to be in current
mainline. Unless there was a mismerge in -next (I haven't checked).
Mark Brown June 3, 2022, 9:21 a.m. UTC | #2
On Thu, Jun 02, 2022 at 08:43:32PM +0100, Catalin Marinas wrote:
> On Tue, May 24, 2022 at 04:14:54PM +0100, Mark Brown wrote:
> > The FP Makefile defines two TEST_PROGS_EXTENDED instead of one of them and one
> > one TEST_GEN_PROGS_EXTENDED for the programs that need compilation. Fix
> > that.

> Do we still need this? The fixed commit already uses
> TEST_GEN_PROGS_EXTENDED and that's what it seems to be in current
> mainline. Unless there was a mismerge in -next (I haven't checked).

Yes, it looks no longer relevant.
diff mbox series

Patch

diff --git a/tools/testing/selftests/arm64/fp/Makefile b/tools/testing/selftests/arm64/fp/Makefile
index a41fef2c9669..36db61358ed5 100644
--- a/tools/testing/selftests/arm64/fp/Makefile
+++ b/tools/testing/selftests/arm64/fp/Makefile
@@ -9,7 +9,7 @@  TEST_GEN_PROGS := fp-stress \
 	sve-ptrace sve-probe-vls \
 	vec-syscfg \
 	za-fork za-ptrace
-TEST_PROGS_EXTENDED := fp-pidbench fpsimd-test \
+TEST_GEN_PROGS_EXTENDED := fp-pidbench fpsimd-test \
 	rdvl-sme rdvl-sve \
 	sve-test \
 	ssve-test \