about summary refs log tree commit diff
path: root/elf/tst-dlopen-tlsmodid-container.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-10-17 08:51:21 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-10-17 08:51:21 +0200
commit7d3db434f910c23591f748a6d0ac3548af1048bb (patch)
treecd81091a7bde637d730cbba69fa68543bc4372c6 /elf/tst-dlopen-tlsmodid-container.c
parenteb77a1fccc7e60cea32245c11288c7f1d92545fa (diff)
downloadglibc-7d3db434f910c23591f748a6d0ac3548af1048bb.tar.gz
glibc-7d3db434f910c23591f748a6d0ac3548af1048bb.tar.xz
glibc-7d3db434f910c23591f748a6d0ac3548af1048bb.zip
Rename and split elf/tst-dlopen-aout collection of tests
From the beginning, elf/tst-dlopen-aout has exercised two different
bugs: (a) failure to report errors for a dlopen of the executable
itself in some cases (bug 24900) and (b) incorrect rollback of the
TLS modid allocation in case of a dlopen failure (bug 16634).

This commit replaces the test with elf/tst-dlopen-self for (a) and
elf/tst-dlopen-tlsmodid for (b).  The latter tests use the
elf/tst-dlopen-self binaries (or iconv) with dlopen, so they are
no longer self-dlopen tests.

Tested on x86_64-linux-gnu and i686-linux-gnu, with a toolchain that
does not default to PIE.
Diffstat (limited to 'elf/tst-dlopen-tlsmodid-container.c')
-rw-r--r--elf/tst-dlopen-tlsmodid-container.c39
1 files changed, 39 insertions, 0 deletions
diff --git a/elf/tst-dlopen-tlsmodid-container.c b/elf/tst-dlopen-tlsmodid-container.c
new file mode 100644
index 0000000000..7cf82bc13f
--- /dev/null
+++ b/elf/tst-dlopen-tlsmodid-container.c
@@ -0,0 +1,39 @@
+/* Test case for BZ #16634.  Container version.
+   Copyright (C) 2014-2019 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
+   <https://www.gnu.org/licenses/>.  */
+
+/* This test uses the iconv program as the test binary.  */
+
+#include <stdlib.h>
+#include <support/support.h>
+
+static char *iconv_path;
+
+static __attribute__ ((constructor)) void
+iconv_path_init (void)
+{
+  iconv_path = xasprintf ("%s/iconv", support_bindir_prefix);
+}
+
+static __attribute__ ((destructor)) void
+iconv_path_fini (void)
+{
+  free (iconv_path);
+}
+
+#define TST_DLOPEN_TLSMODID_PATH iconv_path
+#include "tst-dlopen-tlsmodid.h"