perf test: Shell - Limit to only run executable scripts in tests

'perf test''s shell runner will just run everything in the tests
directory (as long as it's not another directory or does not begin
with a dot), but sometimes you find files in there that are not shell
scripts - perf.data output for example if you do some testing and then
the next time you run perf test it tries to run these.

Check the files are executable so they are actually intended to be test
scripts and not just some "random junk" files there.

Signed-off-by: Carsten Haitzler <carsten.haitzler@arm.com>
Reviewed-by: Leo Yan <leo.yan@linaro.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: coresight@lists.linaro.org
Link: http://lore.kernel.org/lkml/20220309122859.31487-1-carsten.haitzler@foss.arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index fac3717d9ba1bb9902fd2372477b175aa4646bea..3c34cb766724d6b41d26b442850c7621258cb3b4 100644 (file)
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -296,7 +296,9 @@ static const char *shell_test__description(char *description, size_t size,
 
 #define for_each_shell_test(entlist, nr, base, ent)                    \
        for (int __i = 0; __i < nr && (ent = entlist[__i]); __i++)      \
-               if (!is_directory(base, ent) && ent->d_name[0] != '.')
+               if (!is_directory(base, ent) && \
+                       is_executable_file(base, ent) && \
+                       ent->d_name[0] != '.')
 
 static const char *shell_tests__dir(char *path, size_t size)
 {

diff --git a/tools/perf/util/path.c b/tools/perf/util/path.c
index caed0336429f24fcb10de84ee279e17db4e380e3..ce80b79be1036f9f0624c8230a3dee93bf60cfd4 100644 (file)
--- a/tools/perf/util/path.c
+++ b/tools/perf/util/path.c
@@ -86,9 +86,21 @@ bool is_directory(const char *base_path, const struct dirent *dent)
        char path[PATH_MAX];
        struct stat st;
 
-       sprintf(path, "%s/%s", base_path, dent->d_name);
+       snprintf(path, sizeof(path), "%s/%s", base_path, dent->d_name);
        if (stat(path, &st))
                return false;
 
        return S_ISDIR(st.st_mode);
 }
+
+bool is_executable_file(const char *base_path, const struct dirent *dent)
+{
+       char path[PATH_MAX];
+       struct stat st;
+
+       snprintf(path, sizeof(path), "%s/%s", base_path, dent->d_name);
+       if (stat(path, &st))
+               return false;
+
+       return !S_ISDIR(st.st_mode) && (st.st_mode & S_IXUSR);
+}

diff --git a/tools/perf/util/path.h b/tools/perf/util/path.h
index 083429b7efa37d85f3b67055c9922e8890bedc20..d94902c222223423b7401da9f9df130f3aec3da2 100644 (file)
--- a/tools/perf/util/path.h
+++ b/tools/perf/util/path.h
@@ -12,5 +12,6 @@ int path__join3(char *bf, size_t size, const char *path1, const char *path2, con
 
 bool is_regular_file(const char *file);
 bool is_directory(const char *base_path, const struct dirent *dent);
+bool is_executable_file(const char *base_path, const struct dirent *dent);
 
 #endif /* _PERF_PATH_H */