4:54 a.m.
Meson doesn't use .libs directory, everything is placed directly into
directories where meson.build file is used.
In order to have working tests we need to fix all the paths pointing
'.libs' directory.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
docs/logging.html.in | 2 +-
examples/systemtap/lock-debug.stp | 2 +-
run.in | 2 +-
src/driver.c | 2 +-
src/libvirt-lxc.pc.in | 2 +-
src/libvirt-qemu.pc.in | 2 +-
src/libvirt.pc.in | 2 +-
src/locking/lock_manager.c | 2 +-
src/storage/storage_backend.c | 2 +-
src/util/virstoragefilebackend.c | 2 +-
tests/securityselinuxlabeltest.c | 2 +-
tests/securityselinuxtest.c | 2 +-
tests/shunloadtest.c | 4 ++--
tests/testutils.h | 2 +-
tests/viridentitytest.c | 2 +-
tests/virt-aa-helper-test | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/docs/logging.html.in b/docs/logging.html.in
index 3ff0dd3eb67..b4e7d0c3864 100644
--- a/docs/logging.html.in
+++ b/docs/logging.html.in
@@ -209,7 +209,7 @@ $ journalctl MESSAGE_ID=8ae2f3fb-2dbe-498e-8fbd-012d40afa361
--output=json
"LIBVIRT_QEMU_BINARY" : "/bin/qemu-system-xtensa",
"MESSAGE" : "Failed to probe capabilities for
/bin/qemu-system-xtensa:" \
"internal error: Child process (LC_ALL=C
LD_LIBRARY_PATH=/home/berrange" \
- "/src/virt/libvirt/src/.libs
PATH=/usr/lib64/ccache:/usr/local/sbin:" \
+ "/src/virt/libvirt/src PATH=/usr/lib64/ccache:/usr/local/sbin:"
\
"/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin HOME=/root
" \
"USER=root LOGNAME=root /bin/qemu-system-xtensa -help) unexpected
" \
"exit status 127: /bin/qemu-system-xtensa: error while loading shared
" \
diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-debug.stp
index 0c9cc386924..a68a3855695 100644
--- a/examples/systemtap/lock-debug.stp
+++ b/examples/systemtap/lock-debug.stp
@@ -12,7 +12,7 @@
# source git directory, it should be only slight modification to the following:
#
# ./run stap --ldd -c src/libvirtd -d src/libvirtd
-# examples/systemtap/lock-debug.stp src/.libs/libvirt.so
+# examples/systemtap/lock-debug.stp src/libvirt.so
#
# Debug RWLock mechanisms as well.
#
diff --git a/run.in b/run.in
index d508e648020..1a0dee4d9ee 100644
--- a/run.in
+++ b/run.in
@@ -50,7 +50,7 @@ prepend()
# Find this script.
b=@abs_builddir@
-prepend LD_LIBRARY_PATH "$b/src/.libs"
+prepend LD_LIBRARY_PATH "$b/src"
export LD_LIBRARY_PATH
prepend PKG_CONFIG_PATH "$b/src"
diff --git a/src/driver.c b/src/driver.c
index e7452106ed9..37bf9de3921 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -56,7 +56,7 @@ virDriverLoadModule(const char *name,
if (!(modfile = virFileFindResourceFull(name,
"libvirt_driver_",
".so",
- abs_top_builddir "/src/.libs",
+ abs_top_builddir "/src",
DEFAULT_DRIVER_DIR,
"LIBVIRT_DRIVER_DIR")))
return -1;
diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in
index 9243bcf9034..f6d4dd71e7e 100644
--- a/src/libvirt-lxc.pc.in
+++ b/src/libvirt-lxc.pc.in
@@ -4,7 +4,7 @@
prefix=@abs_top_builddir@
exec_prefix=@abs_top_builddir@
-libdir=@abs_top_builddir(a)/src/.libs
+libdir=@abs_top_builddir@/src
includedir=@abs_top_builddir@/include
source_includedir=@abs_top_srcdir@/include
datarootdir=@abs_top_builddir@
diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in
index a4f9e65c03e..b224679d7e3 100644
--- a/src/libvirt-qemu.pc.in
+++ b/src/libvirt-qemu.pc.in
@@ -4,7 +4,7 @@
prefix=@abs_top_builddir@
exec_prefix=@abs_top_builddir@
-libdir=@abs_top_builddir(a)/src/.libs
+libdir=@abs_top_builddir@/src
includedir=@abs_top_builddir@/include
source_includedir=@abs_top_srcdir@/include
datarootdir=@abs_top_builddir@
diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in
index a16e4552105..93a42a457b4 100644
--- a/src/libvirt.pc.in
+++ b/src/libvirt.pc.in
@@ -4,7 +4,7 @@
prefix=@abs_top_builddir@
exec_prefix=@abs_top_builddir@
-libdir=@abs_top_builddir(a)/src/.libs
+libdir=@abs_top_builddir@/src
includedir=@abs_top_builddir@/include
source_includedir=@abs_top_srcdir@/include
datarootdir=@abs_top_builddir@
diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index 07318fb53f0..39e482f11cd 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -139,7 +139,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name,
if (!(modfile = virFileFindResourceFull(name,
NULL,
".so",
- abs_top_builddir "/src/.libs",
+ abs_top_builddir "/src",
LIBDIR "/libvirt/lock-driver",
"LIBVIRT_LOCK_MANAGER_PLUGIN_DIR")))
goto cleanup;
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index e9f6663e6d1..1f83236f2fc 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -92,7 +92,7 @@ virStorageDriverLoadBackendModule(const char *name,
if (!(modfile = virFileFindResourceFull(name,
"libvirt_storage_backend_",
".so",
- abs_top_builddir "/src/.libs",
+ abs_top_builddir "/src",
STORAGE_BACKEND_MODULE_DIR,
"LIBVIRT_STORAGE_BACKEND_DIR")))
return -1;
diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefilebackend.c
index f362436d9ba..bf452a1dc5d 100644
--- a/src/util/virstoragefilebackend.c
+++ b/src/util/virstoragefilebackend.c
@@ -57,7 +57,7 @@ virStorageFileLoadBackendModule(const char *name,
if (!(modfile = virFileFindResourceFull(name,
"libvirt_storage_file_",
".so",
- abs_top_builddir "/src/.libs",
+ abs_top_builddir "/src",
STORAGE_FILE_MODULE_DIR,
"LIBVIRT_STORAGE_FILE_DIR")))
return -1;
diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
index 50b447c1637..2989a668b75 100644
--- a/tests/securityselinuxlabeltest.c
+++ b/tests/securityselinuxlabeltest.c
@@ -374,4 +374,4 @@ mymain(void)
VIR_TEST_MAIN_PRELOAD(mymain,
VIR_TEST_MOCK("domaincaps"),
- abs_builddir "/.libs/libsecurityselinuxhelper.so")
+ abs_builddir "/libsecurityselinuxhelper.so")
diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 3f069c2d6be..ae4b08b9d8a 100644
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -339,4 +339,4 @@ mymain(void)
return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
-VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir
"/.libs/libsecurityselinuxhelper.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so")
diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c
index b377c07294f..d4ab3cd5acf 100644
--- a/tests/shunloadtest.c
+++ b/tests/shunloadtest.c
@@ -105,8 +105,8 @@ int main(int argc G_GNUC_UNUSED, char **argv)
fprintf(stderr, " .%*s 1 ", 39, "");
signal(SIGSEGV, sigHandler);
- if (!(lib = dlopen("./.libs/libshunload.so", RTLD_LAZY))) {
- fprintf(stderr, "Cannot load ./.libs/libshunload.so %s\n", dlerror());
+ if (!(lib = dlopen(abs_builddir "/libshunload.so", RTLD_LAZY))) {
+ fprintf(stderr, "Cannot load ./libshunload.so %s\n", dlerror());
return 1;
}
if (!(startup = dlsym(lib, "shunloadStart"))) {
diff --git a/tests/testutils.h b/tests/testutils.h
index 3f32aa72002..ff5c98a0785 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -140,7 +140,7 @@ int virTestMain(int argc,
return virTestMain(argc, argv, func, __VA_ARGS__, NULL); \
}
-#define VIR_TEST_MOCK(mock) (abs_builddir "/.libs/lib" mock "mock"
MOCK_EXT)
+#define VIR_TEST_MOCK(mock) (abs_builddir "/lib" mock "mock"
MOCK_EXT)
virCapsPtr virTestGenericCapsInit(void);
virCapsHostNUMAPtr virTestCapsBuildNUMATopology(int seq);
diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index 9a8c8914d36..fd01eeaa80b 100644
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -158,7 +158,7 @@ mymain(void)
}
#if WITH_SELINUX
-VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir
"/.libs/libsecurityselinuxhelper.so")
+VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/libsecurityselinuxhelper.so")
#else
VIR_TEST_MAIN(mymain)
#endif
diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test
index 6a6703ecf5c..8dbe82a6b98 100755
--- a/tests/virt-aa-helper-test
+++ b/tests/virt-aa-helper-test
@@ -15,7 +15,7 @@ fi
output="/dev/null"
use_valgrind=""
-ld_library_path="../src/.libs/"
+ld_library_path="../src/"
if [ ! -z "$1" ] && [ "$1" = "-d" ]; then
output="/dev/stdout"
shift
--
2.26.2