diff options
| author | DJ Delorie <dj@redhat.com> | 2018-07-06 01:10:41 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2018-08-22 21:20:37 -0400 |
| commit | 561b0bec4448f0302cb4915bf67c919bde4a1c57 (patch) | |
| tree | a05c836bfe23e523ec7d357203e7b6599b287f98 /nss | |
| parent | b35d3509caee04b2e196bb832138e4e4042347db (diff) | |
| download | glibc-561b0bec4448f0302cb4915bf67c919bde4a1c57.zip glibc-561b0bec4448f0302cb4915bf67c919bde4a1c57.tar.gz glibc-561b0bec4448f0302cb4915bf67c919bde4a1c57.tar.bz2 | |
Add test-in-container infrastructure.
* Makefile (testroot.pristine): New rules to initialize the
test-in-container "testroot".
* Makerules (all-testsuite): Add tests-container.
* Rules (tests-expected): Add tests-container.
(binaries-all-tests): Likewise.
(tests-container): New, run these tests in the testroot container.
* support/Makefile (others): Add *-container, support_paths.c,
xmkdirp, and links-dso-program.
* support/links-dso-program-c.c: New.
* support/links-dso-program.cc: New.
* support/test-container.c: New.
* support/shell-container.c: New.
* support/echo-container.c: New.
* support/true-container.c: New.
* support/xmkdirp.c: New.
* support/xsymlink.c: New.
* support/support_paths.c: New.
* support/support.h: Add support paths prototypes.
* support/xunistd.h: Add xmkdirp () and xsymlink ().
* nss/tst-nss-test3.c: Convert to test-in-container.
* nss/tst-nss-test3.root/: New.
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/Makefile | 4 | ||||
| -rw-r--r-- | nss/tst-nss-test3.c | 6 | ||||
| -rw-r--r-- | nss/tst-nss-test3.root/etc/nsswitch.conf | 1 | ||||
| -rw-r--r-- | nss/tst-nss-test3.root/tst-nss-test3.script | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/nss/Makefile b/nss/Makefile index 5209fc0..e00a4f7 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -55,11 +55,13 @@ tests-internal = tst-field tests = test-netdb test-digits-dots tst-nss-getpwent bug17079 \ tst-nss-test1 \ tst-nss-test2 \ - tst-nss-test3 \ tst-nss-test4 \ tst-nss-test5 xtests = bug-erange +tests-container = \ + tst-nss-test3 + # Tests which need libdl ifeq (yes,$(build-shared)) tests += tst-nss-files-hosts-erange diff --git a/nss/tst-nss-test3.c b/nss/tst-nss-test3.c index d9d708a..4112231 100644 --- a/nss/tst-nss-test3.c +++ b/nss/tst-nss-test3.c @@ -107,7 +107,11 @@ do_test (void) int i; struct group *g = NULL; - __nss_configure_lookup ("group", "test1"); +/* Previously we used __nss_configure_lookup to isolate the test + from the host environment and to get it to lookup from our new + test1 NSS service module, but now this test is run in a different + root filesystem via the test-container support and we directly + configure the use of the test1 NSS service. */ setgrent (); diff --git a/nss/tst-nss-test3.root/etc/nsswitch.conf b/nss/tst-nss-test3.root/etc/nsswitch.conf new file mode 100644 index 0000000..5e08fe5 --- /dev/null +++ b/nss/tst-nss-test3.root/etc/nsswitch.conf @@ -0,0 +1 @@ +group test1 diff --git a/nss/tst-nss-test3.root/tst-nss-test3.script b/nss/tst-nss-test3.root/tst-nss-test3.script new file mode 100644 index 0000000..a10beb1 --- /dev/null +++ b/nss/tst-nss-test3.root/tst-nss-test3.script @@ -0,0 +1,2 @@ +cp $B/nss/libnss_test1.so $L/libnss_test1.so.2 +cp $B/nss/libnss_test2.so $L/libnss_test2.so.2 |