test: Use positive conditional in test_matches()

It is easier to read the positive conditional.

While at it, convert hard coded length of "_test_" to strlen("_test_")
which will be converted to a constant bu optimizing compiler.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/test/test-main.c b/test/test-main.c
index 1824cce..7afe874 100644 (file)
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -148,16 +148,16 @@ static bool test_matches(const char *prefix, const char *test_name,
        if (!strncmp(test_name, select_name, len))
                return true;
 
-       if (!prefix) {
+       if (prefix) {
+               /* All tests have this prefix */
+               if (!strncmp(test_name, prefix, strlen(prefix)))
+                       test_name += strlen(prefix);
+       } else {
                const char *p = strstr(test_name, "_test_");
 
                /* convert xxx_test_yyy to yyy, i.e. remove the suite name */
                if (p)
-                       test_name = p + 6;
-       } else {
-               /* All tests have this prefix */
-               if (!strncmp(test_name, prefix, strlen(prefix)))
-                       test_name += strlen(prefix);
+                       test_name = p + strlen("_test_");
        }
 
        if (!strncmp(test_name, select_name, len))