From c43f55f35459d0b4fcfdb5617789ccf467130423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= Date: Mon, 25 Jan 2016 10:40:27 +0000 Subject: tests: conntrack: run testfiles in the correct order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use scandir(3) instead of opendir(3), so that the tests are run in the expected order, otherwise it doesn't make sense to prefix the testfiles with a two digit number, giving the impression that they are run in order. Signed-off-by: Asbjørn Sloth Tønnesen --- tests/conntrack/test-conntrack.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/conntrack/test-conntrack.c b/tests/conntrack/test-conntrack.c index c9097b6..7ce069b 100644 --- a/tests/conntrack/test-conntrack.c +++ b/tests/conntrack/test-conntrack.c @@ -23,14 +23,16 @@ int main() { int ret, ok = 0, bad = 0, line; FILE *fp; - DIR *d; char buf[1024]; + struct dirent **dents; struct dirent *dent; char file[1024]; + int i,n; - d = opendir("testsuite"); + n = scandir("testsuite", &dents, NULL, alphasort); - while ((dent = readdir(d)) != NULL) { + for (i = 0; i < n; i++) { + dent = dents[i]; sprintf(file, "testsuite/%s", dent->d_name); @@ -88,7 +90,11 @@ int main() } fclose(fp); } - closedir(d); + + for (i = 0; i < n; i++) + free(dents[i]); + + free(dents); fprintf(stdout, "OK: %d BAD: %d\n", ok, bad); } -- cgit v1.2.3