* [PATCH 1/2] kselftest/alsa - mixer: Always log control names
2023-03-06 15:33 [PATCH 0/2] kselftest/alsa: Log card and control information during startup Mark Brown
@ 2023-03-06 15:33 ` Mark Brown
2023-03-06 15:33 ` [PATCH 2/2] kselftest/alsa: Log card names during startup Mark Brown
2023-03-08 5:36 ` [PATCH 0/2] kselftest/alsa: Log card and control information " Takashi Iwai
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2023-03-06 15:33 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai, Shuah Khan
Cc: alsa-devel, linux-kselftest, linux-kernel, Mark Brown
Currently we only log the names of controls on error but it can be useful
to know what control we're testing (for example, when looking at why the
tests are taking a while to run). People looking at test logs may not have
direct access to the target system. This will increase the amount we write
to the console, hopefully that's buffered.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
tools/testing/selftests/alsa/mixer-test.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c
index 05f1749ae19d..12f58c9c17ab 100644
--- a/tools/testing/selftests/alsa/mixer-test.c
+++ b/tools/testing/selftests/alsa/mixer-test.c
@@ -422,6 +422,9 @@ static void test_ctl_name(struct ctl_data *ctl)
bool name_ok = true;
bool check;
+ ksft_print_msg("%d.%d %s\n", ctl->card->card, ctl->elem,
+ ctl->name);
+
/* Only boolean controls should end in Switch */
if (strend(ctl->name, " Switch")) {
if (snd_ctl_elem_info_get_type(ctl->info) != SND_CTL_ELEM_TYPE_BOOLEAN) {
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] kselftest/alsa: Log card names during startup
2023-03-06 15:33 [PATCH 0/2] kselftest/alsa: Log card and control information during startup Mark Brown
2023-03-06 15:33 ` [PATCH 1/2] kselftest/alsa - mixer: Always log control names Mark Brown
@ 2023-03-06 15:33 ` Mark Brown
2023-03-08 5:36 ` [PATCH 0/2] kselftest/alsa: Log card and control information " Takashi Iwai
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2023-03-06 15:33 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai, Shuah Khan
Cc: alsa-devel, linux-kselftest, linux-kernel, Mark Brown
It can be helpful to know which card numbers apply to which cards in a
multi-card system so log the card names when we start the test programs.
People looking at the logs may not have direct access to the systems being
tested.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
tools/testing/selftests/alsa/mixer-test.c | 10 ++++++++++
tools/testing/selftests/alsa/pcm-test.c | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c
index 12f58c9c17ab..f9307bb0e453 100644
--- a/tools/testing/selftests/alsa/mixer-test.c
+++ b/tools/testing/selftests/alsa/mixer-test.c
@@ -63,6 +63,7 @@ static void find_controls(void)
struct card_data *card_data;
struct ctl_data *ctl_data;
snd_config_t *config;
+ char *card_name, *card_longname;
card = -1;
if (snd_card_next(&card) < 0 || card < 0)
@@ -84,6 +85,15 @@ static void find_controls(void)
goto next_card;
}
+ err = snd_card_get_name(card, &card_name);
+ if (err != 0)
+ card_name = "Unknown";
+ err = snd_card_get_longname(card, &card_longname);
+ if (err != 0)
+ card_longname = "Unknown";
+ ksft_print_msg("Card %d - %s (%s)\n", card,
+ card_name, card_longname);
+
/* Count controls */
snd_ctl_elem_list_malloc(&card_data->ctls);
snd_ctl_elem_list(card_data->handle, card_data->ctls);
diff --git a/tools/testing/selftests/alsa/pcm-test.c b/tools/testing/selftests/alsa/pcm-test.c
index 58b525a4a32c..d73600e93e83 100644
--- a/tools/testing/selftests/alsa/pcm-test.c
+++ b/tools/testing/selftests/alsa/pcm-test.c
@@ -149,6 +149,7 @@ static void missing_devices(int card, snd_config_t *card_config)
static void find_pcms(void)
{
char name[32], key[64];
+ char *card_name, *card_longname;
int card, dev, subdev, count, direction, err;
snd_pcm_stream_t stream;
struct pcm_data *pcm_data;
@@ -175,6 +176,15 @@ static void find_pcms(void)
goto next_card;
}
+ err = snd_card_get_name(card, &card_name);
+ if (err != 0)
+ card_name = "Unknown";
+ err = snd_card_get_longname(card, &card_longname);
+ if (err != 0)
+ card_longname = "Unknown";
+ ksft_print_msg("Card %d - %s (%s)\n", card,
+ card_name, card_longname);
+
card_config = conf_by_card(card);
card_data = calloc(1, sizeof(*card_data));
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread