Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 378811ac authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Handle properly readdir DT_UNKNOWN 



Some system can return DT_UNKNOWN in readdir's struct dirent::d_type and
we must handle it properly. In this case we can directly check if the
entity we found is directory and skip it.

Reported-by: default avatarMichael Petlan <mpetlan@redhat.com>
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20171206174535.25380-1-jolsa@kernel.org


[ Split from a larger patch ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 06c3f2aa

tools/perf/tests/builtin-test.c

+5 −5
Original line number Diff line number Diff line
@@ -411,9 +411,9 @@ static const char *shell_test__description(char *description, size_t size, 
	return description ? trim(description + 1) : NULL;

}



#define for_each_shell_test(dir, ent)		\

#define for_each_shell_test(dir, base, ent)	\

	while ((ent = readdir(dir)) != NULL)	\

		if (ent->d_type == DT_REG && ent->d_name[0] != '.')

		if (!is_directory(base, ent))



static const char *shell_tests__dir(char *path, size_t size)

{
@@ -452,7 +452,7 @@ static int shell_tests__max_desc_width(void) 
	if (!dir)

		return -1;



	for_each_shell_test(dir, ent) {

	for_each_shell_test(dir, path, ent) {

		char bf[256];

		const char *desc = shell_test__description(bf, sizeof(bf), path, ent->d_name);
@@ -504,7 +504,7 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width) 
	if (!dir)

		return -1;



	for_each_shell_test(dir, ent) {

	for_each_shell_test(dir, st.dir, ent) {

		int curr = i++;

		char desc[256];

		struct test test = {
@@ -614,7 +614,7 @@ static int perf_test__list_shell(int argc, const char **argv, int i) 
	if (!dir)

		return -1;



	for_each_shell_test(dir, ent) {

	for_each_shell_test(dir, path, ent) {

		int curr = i++;

		char bf[256];

		struct test t = {