lkml.org 
[lkml]   [2021]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH 01/12] perf test: Shell - Limit to only run executable scripts in tests
    From

    On 12/15/21 13:27, James Clark wrote:
    >
    >
    > On 15/12/2021 12:53, carsten.haitzler@foss.arm.com wrote:
    >> From: Carsten Haitzler <carsten.haitzler@arm.com>
    >>
    >> 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.
    >>
    >
    > Hi Carsten,
    >
    > Because these apply to tools/perf files rather than the coresight drivers
    > they will need to apply to Arnaldo's perf/core branch. At the moment I'm
    > getting merge conflicts so I can't test and review them.
    >
    > I also think you would have to do to: linux-perf-users@vger.kernel.org and acme@kernel.org

    I will send updated versions of the series and include the above -
    though perf-users does describe itself for users and not development,
    thus I skipped it. I should get the full list then of everyone

    > James
    >
    >> Signed-off-by: Carsten Haitzler <carsten.haitzler@arm.com>
    >> ---
    >> tools/perf/tests/builtin-test.c | 2 +-
    >> tools/perf/util/path.c | 12 ++++++++++++
    >> tools/perf/util/path.h | 1 +
    >> 3 files changed, 14 insertions(+), 1 deletion(-)
    >>
    >> diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
    >> index c4b888f18e9c..1a7e21e5acf1 100644
    >> --- a/tools/perf/tests/builtin-test.c
    >> +++ b/tools/perf/tests/builtin-test.c
    >> @@ -512,7 +512,7 @@ static const char *shell_test__description(char *description, size_t size,
    >>
    >> #define for_each_shell_test(dir, base, ent) \
    >> while ((ent = readdir(dir)) != NULL) \
    >> - 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 caed0336429f..7dde8c230ae8 100644
    >> --- a/tools/perf/util/path.c
    >> +++ b/tools/perf/util/path.c
    >> @@ -92,3 +92,15 @@ bool is_directory(const char *base_path, const struct dirent *dent)
    >>
    >> 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;
    >> +
    >> + sprintf(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 083429b7efa3..d94902c22222 100644
    >> --- 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 */
    >>

    \
     
     \ /
      Last update: 2021-12-15 17:01    [W:9.806 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site