mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
e7624d708d
The test-container.c file assumes that ld.so is always named something like /elf/ld-linux-*. But e.g. on s390x it is named ld64.so.1 or ld.so.1 on s390. There are other architectures like power or mips with similar names. This patch introduces the new global variable support_objdir_elf_ldso which contains the absolute path to the runtime linker used by the testsuite, e.g. OBJDIR_PATH/elf/ld-linux-x86-64.so.2. The check in test-container.c is now comparing against this path. Without this patch, test-container.c is searching invalid files / directories and fails to find glibc/nss/tst-nss-test3.root/tst-nss-test3.script. Then the test tst-nss-test3 fails! Reviewed-by: Carlos O'Donell <carlos@redhat.com> ChangeLog: * support/support.h (support_objdir_elf_ldso): New variable. * support/support_paths.c (support_objdir_elf_ldso): Likewise. * support/Makefile (CFLAGS-support_paths.c): Add definition for OBJDIR_ELF_LDSO_PATH. * support/test-container.c (main): Search for the ld.so which is also used by the testsuite.
60 lines
2.0 KiB
C
60 lines
2.0 KiB
C
/* Various paths that might be needed.
|
|
Copyright (C) 2018 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <support/support.h>
|
|
#include <support/check.h>
|
|
|
|
/* The idea here is to make various makefile-level paths available to
|
|
support programs, as canonicalized absolute paths. */
|
|
|
|
/* These point to the TOP of the source/build tree, not your (or
|
|
support's) subdirectory. */
|
|
#ifdef SRCDIR_PATH
|
|
const char support_srcdir_root[] = SRCDIR_PATH;
|
|
#else
|
|
# error please -DSRCDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef OBJDIR_PATH
|
|
const char support_objdir_root[] = OBJDIR_PATH;
|
|
#else
|
|
# error please -DOBJDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef OBJDIR_ELF_LDSO_PATH
|
|
/* Corresponds to the path to the runtime linker used by the testsuite,
|
|
e.g. OBJDIR_PATH/elf/ld-linux-x86-64.so.2 */
|
|
const char support_objdir_elf_ldso[] = OBJDIR_ELF_LDSO_PATH;
|
|
#else
|
|
# error please -DOBJDIR_ELF_LDSO_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef INSTDIR_PATH
|
|
/* Corresponds to the --prefix= passed to configure. */
|
|
const char support_install_prefix[] = INSTDIR_PATH;
|
|
#else
|
|
# error please -DINSTDIR_PATH=something in the Makefile
|
|
#endif
|
|
|
|
#ifdef LIBDIR_PATH
|
|
/* Corresponds to the install's lib/ or lib64/ directory. */
|
|
const char support_libdir_prefix[] = LIBDIR_PATH;
|
|
#else
|
|
# error please -DLIBDIR_PATH=something in the Makefile
|
|
#endif
|