Skip to contentSkip to conversation

selftests: alsa: make LDLIBS consistent

PATCH In review Ricardo B. Marliere 2 participants 3 messages Aug 22, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests: alsa: make LDLIBS consistent

In kselftest_deps.sh script, the level 3 parser is broken for the alsa subsystem Makefile.

Output before patch:

$ ./kselftest_deps.sh gcc alsa
========================================================
Kselftest Dependency Check for [./kselftest_deps.sh gcc alsa] results...
========================================================
Checked tests defining LDLIBS dependencies
--------------------------------------------------------
Total tests with Dependencies:
6 Pass: 2 Fail: 4
--------------------------------------------------------
PASS: alsa/Makefile dependency check passed -lasound
PASS: alsa/Makefile dependency check passed -lpthread
--------------------------------------------------------
Targets passed build dependency check on system:
alsa
--------------------------------------------------------
FAIL: alsa/Makefile dependency check: $(shell
FAIL: alsa/Makefile dependency check: pkg-config
FAIL: alsa/Makefile dependency check: --libs
FAIL: alsa/Makefile dependency check: alsa)
--------------------------------------------------------
Targets failed build dependency check on system:
alsa
--------------------------------------------------------
Missing libraries system
$(shell alsa) --libs pkg-config
--------------------------------------------------------
========================================================

Output after patch:

$ ./kselftest_deps.sh gcc alsa
========================================================
Kselftest Dependency Check for [./kselftest_deps.sh gcc alsa] results...
========================================================
Checked tests defining LDLIBS dependencies
--------------------------------------------------------
Total tests with Dependencies:
2 Pass: 2 Fail: 0
--------------------------------------------------------
PASS: alsa/Makefile dependency check passed -lasound
PASS: alsa/Makefile dependency check passed -lpthread
--------------------------------------------------------
Targets passed build dependency check on system:
alsa
--------------------------------------------------------
========================================================
---
 tools/testing/selftests/alsa/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/alsa/Makefile +6 -6
index 5af9ba8a4645..b5670049c4e5 100644
@@ -2,13 +2,13 @@
 #
 
 CFLAGS += $(shell pkg-config --cflags alsa)
-LDLIBS += $(shell pkg-config --libs alsa)
-ifeq ($(LDLIBS),)
-LDLIBS += -lasound
+VAR_LDLIBS += $(shell pkg-config --libs alsa)
+ifeq ($(VAR_LDLIBS),)
+VAR_LDLIBS += -lasound
 endif
 CFLAGS += -L$(OUTPUT) -Wl,-rpath=./
 
-LDLIBS+=-lpthread
+VAR_LDLIBS+=-lpthread
 
 OVERRIDE_TARGETS = 1
 
@@ -21,7 +21,7 @@ TEST_FILES := conf.d pcm-test.conf
 include ../lib.mk
 
 $(OUTPUT)/libatest.so: conf.c alsa-local.h
-	$(CC) $(CFLAGS) -shared -fPIC $< $(LDLIBS) -o $@
+	$(CC) $(CFLAGS) -shared -fPIC $< $(VAR_LDLIBS) -o $@
 
 $(OUTPUT)/%: %.c $(TEST_GEN_PROGS_EXTENDED) alsa-local.h
-	$(CC) $(CFLAGS) $< $(LDLIBS) -latest -o $@
+	$(CC) $(CFLAGS) $< $(VAR_LDLIBS) -latest -o $@
Signature · 1 line
2.40.1
maintainer
#1 lore raw

tools/testing/selftests/alsa/Makefile line 7

Quoted 10 lines · Ricardo B. Marliere

In kselftest_deps.sh script, the level 3 parser is broken for the alsa subsystem Makefile.

CFLAGS += $(shell pkg-config --cflags alsa)

tools/testing/selftests/alsa/Makefile +3 -3
-LDLIBS += $(shell pkg-config --libs alsa)
-ifeq ($(LDLIBS),)
-LDLIBS += -lasound
+VAR_LDLIBS += $(shell pkg-config --libs alsa)
+ifeq ($(VAR_LDLIBS),)
+VAR_LDLIBS += -lasound

This seems like an undocumented bodge for whatever limitation the checker script has. If nothing else someone might come along later and switch back to using the standard variable name, and TBH it does feel like it'd be better to teach the checker to understand the pkg-config idiom here.

#2 lore raw
Quoted 5 lines · Mark Brown

This seems like an undocumented bodge for whatever limitation the checker script has. If nothing else someone might come along later and switch back to using the standard variable name, and TBH it does feel like it'd be better to teach the checker to understand the pkg-config idiom here.

I agree, I submitted a patch to fix the checker script.

Thank you Mark

Signature · 2 lines
Ricardo Marliere	    https://marliere.net/
030A 8E9E 424E E3C0 6557 87E1 C90B 8A7C 6386 58A6