From 444f1a8e225f39526937e10763f006e7602e2163 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 26 Feb 2020 13:04:48 +0200 Subject: [PATCH] tests: re-order test naming pattern The string from get_test_name() can be used for writing screenshot files and others. Starting the name with the fixture number makes an alphabetized listing of output files look unorganized. Let's change the test name to begin with the test (source) name with fixture and element numbers as suffixes. That makes a file listing easier to look through, when you have multiple tests each saving multiple screenshot files. Signed-off-by: Pekka Paalanen --- tests/weston-test-runner.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/weston-test-runner.c b/tests/weston-test-runner.c index c10f286f..8e921707 100644 --- a/tests/weston-test-runner.c +++ b/tests/weston-test-runner.c @@ -55,9 +55,9 @@ static const struct weston_test_run_info *test_run_info_; /** Get the test name string with counter * - * \return The test name with fixture number \c f%%d- prefixed. For an array - * driven test, e.g. defined with TEST_P(), the name has a \c -e%%d suffix to - * indicate the array element number. + * \return The test name with fixture number \c -f%%d added. For an array + * driven test, e.g. defined with TEST_P(), the name has also a \c -e%%d + * suffix to indicate the array element number. * * This is only usable from code paths inside TEST(), TEST_P(), PLUGIN_TEST() * etc. defined functions. @@ -124,11 +124,11 @@ run_test(int fixture_nr, const struct weston_test_entry *t, void *data, struct weston_test_run_info info; if (data) { - snprintf(info.name, sizeof(info.name), "f%d-%s-e%d", - fixture_nr, t->name, iteration); + snprintf(info.name, sizeof(info.name), "%s-f%02d-e%02d", + t->name, fixture_nr, iteration); } else { - snprintf(info.name, sizeof(info.name), "f%d-%s", - fixture_nr, t->name); + snprintf(info.name, sizeof(info.name), "%s-f%02d", + t->name, fixture_nr); } info.fixture_nr = fixture_nr;