diff options
| -rw-r--r-- | posix/Makefile | 6 | ||||
| -rw-r--r-- | posix/bug-ga2.c | 13 | ||||
| -rw-r--r-- | posix/bug-ga2.root/etc/hosts | 1 | ||||
| -rw-r--r-- | posix/bug-ga2.root/etc/nsswitch.conf | 2 | ||||
| -rw-r--r-- | posix/bug-ga2.root/etc/services | 1 | ||||
| -rw-r--r-- | resolv/Makefile | 7 | ||||
| -rw-r--r-- | resolv/tst-leaks2.c | 6 | ||||
| -rw-r--r-- | resolv/tst-leaks2.root/etc/hosts | 1 | ||||
| -rw-r--r-- | resolv/tst-leaks2.root/etc/nsswitch.conf | 1 |
9 files changed, 23 insertions, 15 deletions
diff --git a/posix/Makefile b/posix/Makefile index 693082ed28..fa2d0675cd 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -106,7 +106,8 @@ tests := test-errno tstgetopt testfnm runtests runptests \ tests-internal := bug-regex5 bug-regex20 bug-regex33 \ tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 \ tst-glob_lstat_compat tst-spawn4-compat -xtests := bug-ga2 tst-getaddrinfo4 tst-getaddrinfo5 +tests-container := bug-ga2 +xtests := tst-getaddrinfo4 tst-getaddrinfo5 ifeq (yes,$(build-shared)) test-srcs := globtest tests += wordexp-test tst-exec tst-spawn tst-spawn2 tst-spawn3 @@ -153,8 +154,7 @@ tests-special += $(objpfx)bug-regex2-mem.out $(objpfx)bug-regex14-mem.out \ $(objpfx)tst-boost-mem.out $(objpfx)tst-getconf.out \ $(objpfx)bug-glob2-mem.out $(objpfx)tst-vfork3-mem.out \ $(objpfx)tst-fnmatch-mem.out $(objpfx)bug-regex36-mem.out \ - $(objpfx)tst-glob-tilde-mem.out -xtests-special += $(objpfx)bug-ga2-mem.out + $(objpfx)tst-glob-tilde-mem.out $(objpfx)bug-ga2-mem.out endif include ../Rules diff --git a/posix/bug-ga2.c b/posix/bug-ga2.c index 5ea759b8ce..712e40de48 100644 --- a/posix/bug-ga2.c +++ b/posix/bug-ga2.c @@ -3,9 +3,10 @@ #include <netdb.h> #include <stdio.h> #include <string.h> +#include <support/check.h> -int -main (void) +static int +do_test (void) { struct addrinfo hints, *res; int i, ret; @@ -20,11 +21,11 @@ main (void) ret = getaddrinfo ("www.gnu.org", "http", &hints, &res); if (ret) - { - printf ("%s\n", gai_strerror (ret)); - return 1; - } + FAIL_EXIT1 ("%s\n", gai_strerror (ret)); + freeaddrinfo (res); } return 0; } + +#include <support/test-driver.c> diff --git a/posix/bug-ga2.root/etc/hosts b/posix/bug-ga2.root/etc/hosts new file mode 100644 index 0000000000..65151f27f5 --- /dev/null +++ b/posix/bug-ga2.root/etc/hosts @@ -0,0 +1 @@ +192.0.2.1 www.gnu.org diff --git a/posix/bug-ga2.root/etc/nsswitch.conf b/posix/bug-ga2.root/etc/nsswitch.conf new file mode 100644 index 0000000000..fd2edb44dc --- /dev/null +++ b/posix/bug-ga2.root/etc/nsswitch.conf @@ -0,0 +1,2 @@ +services: files +hosts: files diff --git a/posix/bug-ga2.root/etc/services b/posix/bug-ga2.root/etc/services new file mode 100644 index 0000000000..94d4f07612 --- /dev/null +++ b/posix/bug-ga2.root/etc/services @@ -0,0 +1 @@ +http 80/tcp diff --git a/resolv/Makefile b/resolv/Makefile index dbd8f8bf4f..462c111e13 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -32,7 +32,7 @@ routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \ resolv_context resolv_conf tests = tst-aton tst-leaks tst-inet_ntop -xtests = tst-leaks2 +tests-container = tst-leaks2 tests-internal += tst-inet_aton_exact @@ -125,9 +125,8 @@ endif ifeq ($(run-built-tests),yes) ifneq (no,$(PERL)) -tests-special += $(objpfx)mtrace-tst-leaks.out -xtests-special += $(objpfx)mtrace-tst-leaks2.out -tests-special += $(objpfx)mtrace-tst-resolv-res_ninit.out +tests-special += $(objpfx)mtrace-tst-leaks.out $(objpfx)mtrace-tst-leaks2.out \ + $(objpfx)mtrace-tst-resolv-res_ninit.out endif endif diff --git a/resolv/tst-leaks2.c b/resolv/tst-leaks2.c index a2f5db3adc..49a5d11d49 100644 --- a/resolv/tst-leaks2.c +++ b/resolv/tst-leaks2.c @@ -21,6 +21,7 @@ #include <mcheck.h> #include <netdb.h> #include <resolv.h> +#include <support/check.h> static int do_test (void) @@ -28,8 +29,9 @@ do_test (void) mtrace (); for (int i = 0; i < 20; ++i) { - res_init (); - gethostbyname ("www.gnu.org"); + TEST_VERIFY_EXIT (res_init () == 0); + if (gethostbyname ("www.gnu.org") == NULL) + FAIL_EXIT1 ("%s\n", hstrerror (h_errno)); } return 0; } diff --git a/resolv/tst-leaks2.root/etc/hosts b/resolv/tst-leaks2.root/etc/hosts new file mode 100644 index 0000000000..65151f27f5 --- /dev/null +++ b/resolv/tst-leaks2.root/etc/hosts @@ -0,0 +1 @@ +192.0.2.1 www.gnu.org diff --git a/resolv/tst-leaks2.root/etc/nsswitch.conf b/resolv/tst-leaks2.root/etc/nsswitch.conf new file mode 100644 index 0000000000..5b0c6a4199 --- /dev/null +++ b/resolv/tst-leaks2.root/etc/nsswitch.conf @@ -0,0 +1 @@ +hosts: files |