]> git.hungrycats.org Git - linux/commitdiff
perf tests shell: Skip base_* dirs in test script search
authorMichael Petlan <mpetlan@redhat.com>
Tue, 2 Jul 2024 11:08:40 +0000 (13:08 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 28 Aug 2024 21:07:20 +0000 (18:07 -0300)
The test scripts in base_* directories currently have their own drivers
that run them. Before this patch, the shell test-suite generator causes
them to run twice. Fix that by skipping them in the generator.

A cleaner solution (for future) will be to use the directory structure
idea (introduced by Carsten Haitzler in 7391db645938 ("perf test:
Refactor shell tests allowing subdirs")) to generate test entries with
subtests, like:

  $ perf test list
  [...]
  97: perf probe shell tests
  97:1: perf probe basic functionality
  97:2: perf probe tests with arguments
  97:3: perf probe invalid options handling
  [...]

There is already a lot of shell test scripts and many are about to come,
so there is a need for some hierarchy.

Signed-off-by: Michael Petlan <mpetlan@redhat.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240702110849.31904-3-vmolnaro@redhat.com
Signed-off-by: Veronika Molnarova <vmolnaro@redhat.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/tests/tests-scripts.c

index 8dc1e398288cbe850b1980b6ab88b23e24e1f898..ed114b044293659ef65537036fe55fb1ae77eec2 100644 (file)
@@ -251,6 +251,8 @@ static void append_scripts_in_dir(int dir_fd,
                        if (!S_ISDIR(st.st_mode))
                                continue;
                }
+               if (strncmp(ent->d_name, "base_", 5) == 0)
+                       continue; /* Skip scripts that have a separate driver. */
                fd = openat(dir_fd, ent->d_name, O_PATH);
                append_scripts_in_dir(fd, result, result_sz);
        }