[libvirt PATCH 009/351] meson: tests: remove '.libs' from all relevant paths

[Ján Tomko]

On a Thursday in 2020, Pavel Hrdina wrote:
>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 at 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 " \

This is just an example error message from a past version of libvirt, no
need to rewrite history here.

>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

This does not account for the separate builddir change, but that's out
of scope here.

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20200722/8ba2910c/attachment-0001.sig>