]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
run: set abs_builddir variables
authorJán Tomko <jtomko@redhat.com>
Wed, 11 Aug 2021 07:41:02 +0000 (09:41 +0200)
committerJán Tomko <jtomko@redhat.com>
Thu, 12 Aug 2021 08:33:55 +0000 (10:33 +0200)
test-lib.sh needs these to be set.

Export them so that the virsh-* tests can be run using:
  builddir$ ./run srcdir/tests/virsh-snapshot

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
meson.build
run.in

index 32ad688c9c8ea4b73a706661dbe3104b1bfe9a91..5af09d319afc66d50d333a019ced046d0c7fb989 100644 (file)
@@ -2233,6 +2233,7 @@ configure_file(output: 'meson-config.h', configuration: conf)
 # generate run helper
 run_conf = configuration_data()
 run_conf.set('abs_builddir', meson.build_root())
+run_conf.set('abs_top_builddir', meson.build_root())
 configure_file(
   input: 'run.in',
   output: '@BASENAME@',
diff --git a/run.in b/run.in
index 9aae27a79e67a031f66ec87cc30c674ce11b0e09..64f99751fe6f705e4691f73faf1abb8880d4438e 100644 (file)
--- a/run.in
+++ b/run.in
@@ -80,6 +80,9 @@ env["LIBVIRT_DIR_OVERRIDE"] = "1"
 # read problems when using glibc.
 env["MALLOC_PERTURB_"] = "%d" % random.randint(1, 255)
 
+env["abs_builddir"] = "@abs_builddir@"
+env["abs_top_builddir"] = "@abs_top_builddir@"
+
 modular_daemons = [
     "virtinterfaced",
     "virtlxcd",