|
@@ -411,9 +411,9 @@ static const char *shell_test__description(char *description, size_t size,
|
|
return description ? trim(description + 1) : NULL;
|
|
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) \
|
|
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)
|
|
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)
|
|
if (!dir)
|
|
return -1;
|
|
return -1;
|
|
|
|
|
|
- for_each_shell_test(dir, ent) {
|
|
|
|
|
|
+ for_each_shell_test(dir, path, ent) {
|
|
char bf[256];
|
|
char bf[256];
|
|
const char *desc = shell_test__description(bf, sizeof(bf), path, ent->d_name);
|
|
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)
|
|
if (!dir)
|
|
return -1;
|
|
return -1;
|
|
|
|
|
|
- for_each_shell_test(dir, ent) {
|
|
|
|
|
|
+ for_each_shell_test(dir, st.dir, ent) {
|
|
int curr = i++;
|
|
int curr = i++;
|
|
char desc[256];
|
|
char desc[256];
|
|
struct test test = {
|
|
struct test test = {
|
|
@@ -614,7 +614,7 @@ static int perf_test__list_shell(int argc, const char **argv, int i)
|
|
if (!dir)
|
|
if (!dir)
|
|
return -1;
|
|
return -1;
|
|
|
|
|
|
- for_each_shell_test(dir, ent) {
|
|
|
|
|
|
+ for_each_shell_test(dir, path, ent) {
|
|
int curr = i++;
|
|
int curr = i++;
|
|
char bf[256];
|
|
char bf[256];
|
|
struct test t = {
|
|
struct test t = {
|