OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update nss tests to new skeleton 

* bug17079.c: Update to new test harness.
* test-digits-dots.c: Likewise.
* test-netdb.c: Likewise.
* tst-field.c: Likewise.
* tst-nss-getpwent.c: Likewise.
* tst-nss-static.c: Likewise.
* tst-nss-test1.c: Likewise.
* tst-nss-test2.c: Likewise.
* tst-nss-test3.c: Likewise.
* tst-nss-test4.c: Likewise.
* tst-nss-test5.c: Likewise.
This commit is contained in:
DJ Delorie 2017-08-17 17:58:25 -04:00
parent c22845744c
commit a3fe6a20bf
12 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2017-08-17 DJ Delorie <dj@redhat.com>
* bug17079.c: Update to new test harness.
* test-digits-dots.c: Likewise.
* test-netdb.c: Likewise.
* tst-field.c: Likewise.
* tst-nss-getpwent.c: Likewise.
* tst-nss-static.c: Likewise.
* tst-nss-test1.c: Likewise.
* tst-nss-test2.c: Likewise.
* tst-nss-test3.c: Likewise.
* tst-nss-test4.c: Likewise.
* tst-nss-test5.c: Likewise.
2017-08-17 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2017-08-17 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/generic/not-cancel.h (open_not_cancel): Remove macro. * sysdeps/generic/not-cancel.h (open_not_cancel): Remove macro.

23
nss/bug17079.c
View File

@ -23,6 +23,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <support/support.h>
/* Check if two passwd structs contain the same data. */ /* Check if two passwd structs contain the same data. */
static bool static bool
equal (const struct passwd *a, const struct passwd *b) equal (const struct passwd *a, const struct passwd *b)
@ -52,13 +54,13 @@ init_test_items (void)
if (pwd == NULL) if (pwd == NULL)
break; break;
struct passwd *target = test_items + test_count; struct passwd *target = test_items + test_count;
target->pw_name = strdup (pwd->pw_name); target->pw_name = xstrdup (pwd->pw_name);
target->pw_passwd = strdup (pwd->pw_passwd); target->pw_passwd = xstrdup (pwd->pw_passwd);
target->pw_uid = pwd->pw_uid; target->pw_uid = pwd->pw_uid;
target->pw_gid = pwd->pw_gid; target->pw_gid = pwd->pw_gid;
target->pw_gecos = strdup (pwd->pw_gecos); target->pw_gecos = xstrdup (pwd->pw_gecos);
target->pw_dir = strdup (pwd->pw_dir); target->pw_dir = xstrdup (pwd->pw_dir);
target->pw_shell = strdup (pwd->pw_shell); target->pw_shell = xstrdup (pwd->pw_shell);
} }
while (++test_count < MAX_TEST_ITEMS); while (++test_count < MAX_TEST_ITEMS);
endpwent (); endpwent ();
@ -108,13 +110,7 @@ static void
test_one (const struct passwd *item, size_t buffer_size, test_one (const struct passwd *item, size_t buffer_size,
char pad, size_t padding_size) char pad, size_t padding_size)
{ {
char *buffer = malloc (buffer_size + padding_size); char *buffer = xmalloc (buffer_size + padding_size);
if (buffer == NULL)
{
puts ("error: malloc failure");
errors = true;
return;
}
struct passwd pwd; struct passwd pwd;
struct passwd *result; struct passwd *result;
@ -240,5 +236,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

5
nss/test-digits-dots.c
View File

@ -21,6 +21,8 @@
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <errno.h>
#include <support/support.h>
static int static int
do_test (void) do_test (void)
{ {
@ -34,5 +36,4 @@ do_test (void)
return err == ERANGE && h_err == NETDB_INTERNAL ? EXIT_SUCCESS : EXIT_FAILURE; return err == ERANGE && h_err == NETDB_INTERNAL ? EXIT_SUCCESS : EXIT_FAILURE;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

7
nss/test-netdb.c
View File

@ -40,6 +40,8 @@
#include <errno.h> #include <errno.h>
#include "nss.h" #include "nss.h"
#include <support/support.h>
/* /*
The following define is necessary for glibc 2.0.6 The following define is necessary for glibc 2.0.6
*/ */
@ -177,7 +179,7 @@ test_hosts (void)
while (gethostname (name, namelen) < 0 && errno == ENAMETOOLONG) while (gethostname (name, namelen) < 0 && errno == ENAMETOOLONG)
{ {
namelen += 2; /* tiny increments to test a lot */ namelen += 2; /* tiny increments to test a lot */
name = realloc (name, namelen); name = xrealloc (name, namelen);
} }
if (gethostname (name, namelen) == 0) if (gethostname (name, namelen) == 0)
{ {
@ -336,5 +338,4 @@ do_test (void)
return (error_count != 0); return (error_count != 0);
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

5
nss/tst-field.c
View File

@ -25,6 +25,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <support/support.h>
static bool errors; static bool errors;
static void static void
@ -97,5 +99,4 @@ do_test (void)
return errors; return errors;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

19
nss/tst-nss-getpwent.c
View File

@ -21,6 +21,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <support/support.h>
int int
do_test (void) do_test (void)
{ {
@ -37,22 +39,12 @@ do_test (void)
{ {
if (first_name == NULL) if (first_name == NULL)
{ {
first_name = strdup (pw->pw_name); first_name = xstrdup (pw->pw_name);
if (first_name == NULL)
{
printf ("strdup: %m\n");
return 1;
}
first_uid = pw->pw_uid; first_uid = pw->pw_uid;
} }
free (last_name); free (last_name);
last_name = strdup (pw->pw_name); last_name = xstrdup (pw->pw_name);
if (last_name == NULL)
{
printf ("strdup: %m\n");
return 1;
}
last_uid = pw->pw_uid; last_uid = pw->pw_uid;
++count; ++count;
} }
@ -115,5 +107,4 @@ do_test (void)
} }
#define TIMEOUT 300 #define TIMEOUT 300
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

5
nss/tst-nss-static.c
View File

@ -1,7 +1,8 @@
/* glibc test for static NSS. */ /* glibc test for static NSS. */
#include <stdio.h> #include <stdio.h>
#define TEST_FUNCTION do_test () #include <support/support.h>
static int static int
do_test (void) do_test (void)
{ {
@ -12,4 +13,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

5
nss/tst-nss-test1.c
View File

@ -22,6 +22,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <support/support.h>
#include "nss_test.h" #include "nss_test.h"
static int hook_called = 0; static int hook_called = 0;
@ -120,5 +122,4 @@ do_test (void)
return retval; return retval;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

5
nss/tst-nss-test2.c
View File

@ -22,6 +22,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <support/support.h>
#include "nss_test.h" #include "nss_test.h"
/* The data in these tables is arbitrary, but the merged data based on /* The data in these tables is arbitrary, but the merged data based on
@ -132,5 +134,4 @@ do_test (void)
return retval; return retval;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

6
nss/tst-nss-test3.c
View File

@ -20,7 +20,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/signal.h>
#include <support/support.h>
#include "nss_test.h" #include "nss_test.h"
@ -146,5 +147,4 @@ do_test (void)
} }
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

6
nss/tst-nss-test4.c
View File

@ -20,7 +20,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/signal.h>
#include <support/support.h>
#include "nss_test.h" #include "nss_test.h"
@ -133,5 +134,4 @@ do_test (void)
} }
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

5
nss/tst-nss-test5.c
View File

@ -22,6 +22,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <support/support.h>
#include "nss_test.h" #include "nss_test.h"
/* The specific values and names used here are arbitrary, other than /* The specific values and names used here are arbitrary, other than
@ -104,5 +106,4 @@ do_test (void)
} }
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"