From da3a1594af4e97757f74eb5fce6700c3ce40a8b7 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 6 Feb 2015 12:29:27 -0800 Subject: Move tst-getlogin to login/ subdirectory. --- ChangeLog | 5 +++++ login/Makefile | 2 +- login/tst-getlogin.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ posix/Makefile | 2 +- posix/tst-getlogin.c | 60 ---------------------------------------------------- 5 files changed, 67 insertions(+), 62 deletions(-) create mode 100644 login/tst-getlogin.c delete mode 100644 posix/tst-getlogin.c diff --git a/ChangeLog b/ChangeLog index 47f698f575..08f77fe3ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2015-02-06 Roland McGrath + * posix/tst-getlogin.c: Move to ... + * login/tst-getlogin.c: ... here. + * posix/Makefile (tests): Move tst-getlogin to ... + * login/Makefile (tests): ... here. + * libio/tst-atime.c (do_test): Move local variables SV and E inside [ST_NOATIME] conditional. diff --git a/login/Makefile b/login/Makefile index a2ebeff2bf..0f4bb22557 100644 --- a/login/Makefile +++ b/login/Makefile @@ -43,7 +43,7 @@ endif subdir-dirs = programs vpath %.c programs -tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname +tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin # Build the -lutil library with these extra functions. extra-libs := libutil diff --git a/login/tst-getlogin.c b/login/tst-getlogin.c new file mode 100644 index 0000000000..48821d7a3c --- /dev/null +++ b/login/tst-getlogin.c @@ -0,0 +1,60 @@ +/* Copyright (C) 1999-2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +static int +do_test (void) +{ + char *login; + int errors = 0; + + login = getlogin (); + if (login == NULL) + puts ("getlogin returned NULL, no further tests"); + else + { + char name[1024]; + int ret; + + printf ("getlogin returned: `%s'\n", login); + + ret = getlogin_r (name, sizeof (name)); + if (ret == 0) + { + printf ("getlogin_r returned: `%s'\n", name); + if (strcmp (name, login) != 0) + { + puts ("Error: getlogin and getlogin_r returned different names"); + ++errors; + } + } + else + { + printf ("Error: getlogin_r returned: %d (%s)\n", + ret, strerror (ret)); + ++errors; + } + } + + return errors != 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/posix/Makefile b/posix/Makefile index 5ee7b28f2d..15e8818787 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -64,7 +64,7 @@ routines := \ aux := init-posix environ tests := tstgetopt testfnm runtests runptests \ tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \ - tst-getlogin tst-mmap tst-getaddrinfo tst-truncate \ + tst-mmap tst-getaddrinfo tst-truncate \ tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \ tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \ tst-gnuglob tst-regex bug-regex5 bug-regex6 bug-regex7 \ diff --git a/posix/tst-getlogin.c b/posix/tst-getlogin.c deleted file mode 100644 index 48821d7a3c..0000000000 --- a/posix/tst-getlogin.c +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright (C) 1999-2015 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include - -static int -do_test (void) -{ - char *login; - int errors = 0; - - login = getlogin (); - if (login == NULL) - puts ("getlogin returned NULL, no further tests"); - else - { - char name[1024]; - int ret; - - printf ("getlogin returned: `%s'\n", login); - - ret = getlogin_r (name, sizeof (name)); - if (ret == 0) - { - printf ("getlogin_r returned: `%s'\n", name); - if (strcmp (name, login) != 0) - { - puts ("Error: getlogin and getlogin_r returned different names"); - ++errors; - } - } - else - { - printf ("Error: getlogin_r returned: %d (%s)\n", - ret, strerror (ret)); - ++errors; - } - } - - return errors != 0; -} - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" -- cgit v1.2.3