All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 01/12] perf test: Shell - Limit to only run executable scripts in tests
@ 2021-12-15 16:03 carsten.haitzler
  2021-12-15 16:03 ` [PATCH 02/12] perf test: Shell - only run .sh shell files to skip other files carsten.haitzler
                   ` (11 more replies)
  0 siblings, 12 replies; 41+ messages in thread
From: carsten.haitzler @ 2021-12-15 16:03 UTC (permalink / raw)
  To: linux-kernel
  Cc: coresight, suzuki.poulose, mathieu.poirier, mike.leach, leo.yan,
	inux-perf-users, acme

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.

Signed-off-by: Carsten Haitzler <carsten.haitzler@arm.com>
---
 tools/perf/tests/builtin-test.c |  4 +++-
 tools/perf/util/path.c          | 12 ++++++++++++
 tools/perf/util/path.h          |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 8cb5a1c3489e..ece272b55587 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -295,7 +295,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 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 */
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [PATCH 01/12] perf test: Shell - Limit to only run executable scripts in tests
@ 2021-12-15 16:22 carsten.haitzler
  2021-12-15 16:22 ` [PATCH 04/12] perf test: Add beginning of test infra + test to exercise coresight carsten.haitzler
  0 siblings, 1 reply; 41+ messages in thread
From: carsten.haitzler @ 2021-12-15 16:22 UTC (permalink / raw)
  To: linux-perf-users

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.

Signed-off-by: Carsten Haitzler <carsten.haitzler@arm.com>
---
 tools/perf/tests/builtin-test.c |  4 +++-
 tools/perf/util/path.c          | 12 ++++++++++++
 tools/perf/util/path.h          |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 8cb5a1c3489e..ece272b55587 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -295,7 +295,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 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 */
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 41+ messages in thread
* [PATCH 01/12] perf test: Shell - Limit to only run executable scripts in tests
@ 2021-12-15 12:53 carsten.haitzler
  2021-12-15 12:54 ` [PATCH 04/12] perf test: Add beginning of test infra + test to exercise coresight carsten.haitzler
  0 siblings, 1 reply; 41+ messages in thread
From: carsten.haitzler @ 2021-12-15 12:53 UTC (permalink / raw)
  To: linux-kernel
  Cc: coresight, suzuki.poulose, mathieu.poirier, mike.leach, leo.yan

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.

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 */
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 41+ messages in thread

end of thread, other threads:[~2022-03-11 14:27 UTC | newest]

Thread overview: 41+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-15 16:03 [PATCH 01/12] perf test: Shell - Limit to only run executable scripts in tests carsten.haitzler
2021-12-15 16:03 ` [PATCH 02/12] perf test: Shell - only run .sh shell files to skip other files carsten.haitzler
2021-12-16 10:22   ` Daniel Thompson
2021-12-16 19:45     ` Carsten Haitzler
2021-12-17 15:00   ` Suzuki K Poulose
2021-12-17 17:22     ` Carsten Haitzler
2021-12-15 16:03 ` [PATCH 03/12] perf test: Use 3 digits for test numbering now we can have more tests carsten.haitzler
2021-12-21 12:35   ` Leo Yan
2021-12-21 20:51     ` Arnaldo Carvalho de Melo
2021-12-15 16:03 ` [PATCH 04/12] perf test: Add beginning of test infra + test to exercise coresight carsten.haitzler
2021-12-21 15:03   ` Leo Yan
2021-12-21 20:40     ` Arnaldo Carvalho de Melo
2022-01-04 15:15       ` Carsten Haitzler
2022-01-04 15:14     ` Carsten Haitzler
2022-01-19 16:58   ` James Clark
2022-02-04 10:21   ` Mike Leach
2021-12-15 16:03 ` [PATCH 05/12] perf test: Add coresight test to check all threads get some data logged carsten.haitzler
2022-01-03  7:07   ` Leo Yan
2022-01-04 15:01     ` Carsten Haitzler
2021-12-15 16:03 ` [PATCH 06/12] perf test: Add tests to re-use the thread loop test to check aux data carsten.haitzler
2022-02-04 10:36   ` Mike Leach
2021-12-15 16:03 ` [PATCH 07/12] perf test: Add simple bubblesort test for coresight " carsten.haitzler
2022-01-03  8:00   ` Leo Yan
2022-01-04 15:13     ` Carsten Haitzler
2022-01-12  9:54       ` Leo Yan
2021-12-15 16:03 ` [PATCH 08/12] perf test: Add threaded bubblesort tests for coresight carsten.haitzler
2021-12-15 16:04 ` [PATCH 09/12] perf test: Add add memcpy test for coresight quality checking carsten.haitzler
2022-02-04 10:43   ` Mike Leach
2021-12-15 16:04 ` [PATCH 10/12] perf test: Add threaded memcpy tests to check coresight aux data carsten.haitzler
2021-12-15 16:04 ` [PATCH 11/12] perf test: Add unrolled loop tests for " carsten.haitzler
2022-02-04 10:51   ` Mike Leach
2021-12-15 16:04 ` [PATCH 12/12] perf test: Add docs for coresight and related tests carsten.haitzler
2022-01-19 16:43   ` James Clark
2022-01-31 18:05     ` Carsten Haitzler
2022-02-04 14:50       ` Mike Leach
2022-03-09 12:25     ` Carsten Haitzler
2022-03-09 12:30     ` Carsten Haitzler
2021-12-17 14:55 ` [PATCH 01/12] perf test: Shell - Limit to only run executable scripts in tests Suzuki K Poulose
2021-12-17 17:18   ` Carsten Haitzler
  -- strict thread matches above, loose matches on Subject: below --
2021-12-15 16:22 carsten.haitzler
2021-12-15 16:22 ` [PATCH 04/12] perf test: Add beginning of test infra + test to exercise coresight carsten.haitzler
2021-12-15 12:53 [PATCH 01/12] perf test: Shell - Limit to only run executable scripts in tests carsten.haitzler
2021-12-15 12:54 ` [PATCH 04/12] perf test: Add beginning of test infra + test to exercise coresight carsten.haitzler

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.