]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
kselftest/alsa - pcm-test: Don't include diagnostic message in test name
authorMark Brown <broonie@kernel.org>
Thu, 23 Mar 2023 18:48:28 +0000 (18:48 +0000)
committerTakashi Iwai <tiwai@suse.de>
Fri, 24 Mar 2023 06:49:57 +0000 (07:49 +0100)
When reporting errors or skips we currently include the diagnostic message
indicating why we're failing or skipping. This isn't ideal since KTAP
defines the entire print as the test name, so if there's an error then test
systems won't detect the test as being the same one as a passing test. Move
the diagnostic to a separate ksft_print_msg() to avoid this issue, the test
name part will always be the same for passes, fails and skips and the
diagnostic information is still displayed.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230323-alsa-pcm-test-names-v1-1-8be67a8885ff@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
tools/testing/selftests/alsa/pcm-test.c

index d73600e93e83be9c13bad2329d6e59c21f3de418..3e390fe67eb93ed7588161047ce748cffcdcc4a8 100644 (file)
@@ -499,17 +499,18 @@ __close:
        }
 
        if (!skip)
-               ksft_test_result(pass, "%s.%s.%d.%d.%d.%s%s%s\n",
+               ksft_test_result(pass, "%s.%s.%d.%d.%d.%s\n",
                                 test_class_name, test_name,
                                 data->card, data->device, data->subdevice,
-                                snd_pcm_stream_name(data->stream),
-                                msg[0] ? " " : "", msg);
+                                snd_pcm_stream_name(data->stream));
        else
-               ksft_test_result_skip("%s.%s.%d.%d.%d.%s%s%s\n",
+               ksft_test_result_skip("%s.%s.%d.%d.%d.%s\n",
                                 test_class_name, test_name,
                                 data->card, data->device, data->subdevice,
-                                snd_pcm_stream_name(data->stream),
-                                msg[0] ? " " : "", msg);
+                                snd_pcm_stream_name(data->stream));
+
+       if (msg[0])
+               ksft_print_msg("%s\n", msg);
 
        pthread_mutex_unlock(&results_lock);