summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tests/test-getlogin_r.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index aa3435059d..fc8a08153f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2014-05-22 Pádraig Brady <P@draigBrady.com>
+ getlogin_r-tests: check return value rather than errno
+ * tests/test-getlogin_r.c (main): As per POSIX we should be
+ verifying the return value from getlogin_r() rather than errno.
+
+2014-05-22 Pádraig Brady <P@draigBrady.com>
+
getlogin_r-tests: fix various issues in recent change
* tests/test-getlogin_r.c: Include required headers that were
missed in recent commit eec20b4e.
diff --git a/tests/test-getlogin_r.c b/tests/test-getlogin_r.c
index 5c7078df8e..11ded88f98 100644
--- a/tests/test-getlogin_r.c
+++ b/tests/test-getlogin_r.c
@@ -45,7 +45,7 @@ main (void)
err = getlogin_r (buf, sizeof (buf));
if (err != 0)
{
- if (errno == ENOENT)
+ if (err == ENOENT)
{
/* This can happen on GNU/Linux. */
fprintf (stderr, "Skipping test: no entry in utmp file.\n");
@@ -53,9 +53,9 @@ main (void)
}
/* getlogin_r() fails when stdin is not connected to a tty. */
- ASSERT (errno == ENOTTY
- || errno == EINVAL /* seen on Linux/SPARC */
- || errno == ENXIO
+ ASSERT (err == ENOTTY
+ || err == EINVAL /* seen on Linux/SPARC */
+ || err == ENXIO
);
#if !defined __hpux /* On HP-UX 11.11 it fails anyway. */
ASSERT (! isatty (0));