[src/trunk]: src/tests/lib/libc/gen more error checks

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3a1ab33e6ae2
branches:  trunk
changeset: 820583:3a1ab33e6ae2
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 11 18:15:02 2017 +0000

description:
more error checks

diffstat:

 tests/lib/libc/gen/t_dir.c |  32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diffs (78 lines):

diff -r 5a847beced3b -r 3a1ab33e6ae2 tests/lib/libc/gen/t_dir.c
--- a/tests/lib/libc/gen/t_dir.c        Wed Jan 11 18:09:40 2017 +0000
+++ b/tests/lib/libc/gen/t_dir.c        Wed Jan 11 18:15:02 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_dir.c,v 1.9 2017/01/11 18:09:40 christos Exp $ */
+/* $NetBSD: t_dir.c,v 1.10 2017/01/11 18:15:02 christos Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -75,29 +75,40 @@
 
        /* skip two for . and .. */
        entry = readdir(dp);
+       ATF_REQUIRE_MSG(entry != NULL, "readdir[%s] failed: %s",
+           ".", strerror(errno));
+
        entry = readdir(dp);
+       ATF_REQUIRE_MSG(entry != NULL, "readdir[%s] failed: %s",
+           "..", strerror(errno));
 
        /* get first entry */
        entry = readdir(dp);
+       ATF_REQUIRE_MSG(entry != NULL, "readdir[%s] failed: %s",
+           "first", strerror(errno));
+
        here = telldir(dp);
-       ATF_REQUIRE_MSG(here != -1,
-           "telldir failed: %s", strerror(errno));
+       ATF_REQUIRE_MSG(here != -1, "telldir failed: %s", strerror(errno));
 
        /* get second entry */
        entry = readdir(dp);
+       ATF_REQUIRE_MSG(entry != NULL, "readdir[%s] failed: %s",
+           "second", strerror(errno));
+
        wasname = strdup(entry->d_name);
        if (wasname == NULL)
                atf_tc_fail("cannot allocate memory");
 
        /* get third entry */
        entry = readdir(dp);
+       ATF_REQUIRE_MSG(entry != NULL, "readdir[%s] failed: %s",
+           "third", strerror(errno));
 
        /* try to return to the position after the first entry */
        seekdir(dp, here);
        entry = readdir(dp);
-
-       if (entry == NULL)
-               atf_tc_fail("entry 1 not found");
+       ATF_REQUIRE_MSG(entry != NULL, "readdir[%s] failed: %s",
+           "first[1]", strerror(errno));
        if (strcmp(entry->d_name, wasname) != 0)
                atf_tc_fail("1st seekdir found wrong name");
 
@@ -105,18 +116,17 @@
        seekdir(dp, here);
        here = telldir(dp);
        entry = readdir(dp);
-
-       if (entry == NULL)
-               atf_tc_fail("entry 2 not found");
+       ATF_REQUIRE_MSG(entry != NULL, "readdir[%s] failed: %s",
+           "second[1]", strerror(errno));
        if (strcmp(entry->d_name, wasname) != 0)
                atf_tc_fail("2nd seekdir found wrong name");
 
        /* One more time, to make sure that telldir() doesn't affect result */
        seekdir(dp, here);
        entry = readdir(dp);
+       ATF_REQUIRE_MSG(entry != NULL, "readdir[%s] failed: %s",
+           "third[1]", strerror(errno));
 
-       if (entry == NULL)
-               atf_tc_fail("entry 3 not found");
        if (strcmp(entry->d_name, wasname) != 0)
                atf_tc_fail("3rd seekdir found wrong name");