From 98ca2c063cfe019b673fd0ce81448c919e9c989c Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com> Date: Thu, 22 May 2014 17:49:33 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ tests/test-getlogin_r.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa3435059d..fc8a08153f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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 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)); -- 2.39.5