Skip to contentSkip to conversation

selftests/arm64: Fix mismerge of Makefile for fp tests

PATCH In review Mark Brown 2 participants 3 messages May 24, 2022 – Jun 3, 2022

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 selftests/arm64: Fix mismerge of Makefile for fp tests

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")
---
 tools/testing/selftests/arm64/fp/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/arm64/fp/Makefile +1 -1
index a41fef2c9669..36db61358ed5 100644
@@ -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 \
Signature · 1 line
2.30.2
maintainer
#1 lore raw
Quoted 15 lines · Mark Brown

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")
---
 tools/testing/selftests/arm64/fp/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/arm64/fp/Makefile +0 -0
index a41fef2c9669..36db61358ed5 100644

tools/testing/selftests/arm64/fp/Makefile TEST_GEN_PROGS := fp-stress \ · line 15

Quoted 8 lines
tools/testing/selftests/arm64/fp/Makefile +1 -1
@@ -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).

Signature · 1 line
Catalin
author
#2 lore raw
Quoted 8 lines · Catalin Marinas
Quoted 3 lines · Mark Brown

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.