tests: mock: Accept spaces in build path

If path to the build directory contains spaces (e.g. meson setup
'a b') then our mocks don't work. The problem is in glibc where
not just a colon but also a space character is a delimiter for
LD_PRELOAD [1]. Hence, a test using mock tries to preload
something like libvirt.git/a b/libsomethingmock.so which is
interpreted by glibc as two separate strings: "libvirt.git/a",
"b/libsomethingmock.so".

One trick to get around this is to set LD_PRELOAD to just the
shared object file (without path) and let glibc find the mock in
paths specified in LD_LIBRARY_PATH (where only a colon or a
semicolon are valid separators [1]). This can be seen in action
by running say:

  LD_DEBUG=libs ./virpcitest

1: https://man7.org/linux/man-pages/man8/ld.so.8.html

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2024-03-22 16:57:44 +01:00
parent ece476ec2e
commit eac646ea49
5 changed files with 18 additions and 6 deletions

View File

@ -347,4 +347,4 @@ mymain(void)
VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MAIN_PRELOAD(mymain,
VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("domaincaps"),
abs_builddir "/libsecurityselinuxhelper.so") "libsecurityselinuxhelper.so")

View File

@ -332,4 +332,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so") VIR_TEST_MAIN_PRELOAD(mymain, "libsecurityselinuxhelper.so")

View File

@ -837,8 +837,10 @@ int virTestMain(int argc,
va_start(ap, func); va_start(ap, func);
while ((lib = va_arg(ap, const char *))) { while ((lib = va_arg(ap, const char *))) {
if (!virFileIsExecutable(lib)) { g_autofree char *abs_lib_path = g_strdup_printf("%s/%s", abs_builddir, lib);
perror(lib);
if (!virFileIsExecutable(abs_lib_path)) {
perror(abs_lib_path);
va_end(ap); va_end(ap);
return EXIT_FAILURE; return EXIT_FAILURE;
} }

View File

@ -123,11 +123,13 @@ int virTestMain(int argc,
#ifdef __APPLE__ #ifdef __APPLE__
# define PRELOAD_VAR "DYLD_INSERT_LIBRARIES" # define PRELOAD_VAR "DYLD_INSERT_LIBRARIES"
# define LD_LIBRARY_PATH "DYLD_LIBRARY_PATH"
# define FORCE_FLAT_NAMESPACE \ # define FORCE_FLAT_NAMESPACE \
g_setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", TRUE); g_setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", TRUE);
# define MOCK_EXT ".dylib" # define MOCK_EXT ".dylib"
#else #else
# define PRELOAD_VAR "LD_PRELOAD" # define PRELOAD_VAR "LD_PRELOAD"
# define LD_LIBRARY_PATH "LD_LIBRARY_PATH"
# define FORCE_FLAT_NAMESPACE # define FORCE_FLAT_NAMESPACE
# define MOCK_EXT ".so" # define MOCK_EXT ".so"
#endif #endif
@ -137,12 +139,20 @@ int virTestMain(int argc,
const char *preload = getenv(PRELOAD_VAR); \ const char *preload = getenv(PRELOAD_VAR); \
if (preload == NULL || strstr(preload, libs) == NULL) { \ if (preload == NULL || strstr(preload, libs) == NULL) { \
char *newenv; \ char *newenv; \
char *new_library_path; \
const char *cur_library_path = g_getenv(LD_LIBRARY_PATH); \
if (!preload) { \ if (!preload) { \
newenv = (char *) libs; \ newenv = (char *) libs; \
} else { \ } else { \
newenv = g_strdup_printf("%s:%s", libs, preload); \ newenv = g_strdup_printf("%s:%s", libs, preload); \
} \ } \
if (!cur_library_path) { \
new_library_path = (char *) abs_builddir; \
} else { \
new_library_path = g_strdup_printf("%s:%s", abs_builddir, cur_library_path); \
} \
g_setenv(PRELOAD_VAR, newenv, TRUE); \ g_setenv(PRELOAD_VAR, newenv, TRUE); \
g_setenv(LD_LIBRARY_PATH, new_library_path, TRUE); \
FORCE_FLAT_NAMESPACE \ FORCE_FLAT_NAMESPACE \
execv(argv[0], argv); \ execv(argv[0], argv); \
} \ } \
@ -153,7 +163,7 @@ int virTestMain(int argc,
return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \ return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \
} }
#define VIR_TEST_MOCK(mock) (abs_builddir "/lib" mock "mock" MOCK_EXT) #define VIR_TEST_MOCK(mock) ("lib" mock "mock" MOCK_EXT)
virCaps *virTestGenericCapsInit(void); virCaps *virTestGenericCapsInit(void);
virCapsHostNUMA *virTestCapsBuildNUMATopology(int seq); virCapsHostNUMA *virTestCapsBuildNUMATopology(int seq);

View File

@ -162,7 +162,7 @@ mymain(void)
} }
#if WITH_SELINUX #if WITH_SELINUX
VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so") VIR_TEST_MAIN_PRELOAD(mymain, "libsecurityselinuxhelper.so")
#else #else
VIR_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)
#endif #endif