[libvirt] [PATCH v4 10/42] build: use @CONFIG@ instead of ::CONFIG:: in augeas tests

Using @VARNAME@ is a normal style of automake, so lets match that. Reviewed-by: Andrea Bolognani <abologna(a)redhat.com&gt; Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- build-aux/augeas-gentest.pl | 2 +- src/bhyve/test_libvirtd_bhyve.aug.in | 2 +- src/libxl/test_libvirtd_libxl.aug.in | 2 +- src/locking/test_libvirt_lockd.aug.in | 2 +- src/locking/test_libvirt_sanlock.aug.in | 2 +- src/locking/test_virtlockd.aug.in | 2 +- src/logging/test_virtlogd.aug.in | 2 +- src/lxc/test_libvirtd_lxc.aug.in | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 2 +- src/remote/test_libvirtd.aug.in | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl index faf2fd593e..65834b533b 100755 --- a/build-aux/augeas-gentest.pl +++ b/build-aux/augeas-gentest.pl @@ -30,7 +30,7 @@ open TEMPLATE, "<", $template or die "cannot read $template: $!"; my $group = 0; while (<TEMPLATE>) { - if (/::CONFIG::/) { + if (/\@CONFIG\@/) { my $group = 0; print " let conf = \""; while (<CONFIG>) { diff --git a/src/bhyve/test_libvirtd_bhyve.aug.in b/src/bhyve/test_libvirtd_bhyve.aug.in index f28e58614d..ec932b4b11 100644 --- a/src/bhyve/test_libvirtd_bhyve.aug.in +++ b/src/bhyve/test_libvirtd_bhyve.aug.in @@ -1,5 +1,5 @@ module Test_libvirtd_bhyve = - ::CONFIG:: + @CONFIG@ test Libvirtd_bhyve.lns get conf = { "firmware_dir" = "/usr/local/share/uefi-firmware" } diff --git a/src/libxl/test_libvirtd_libxl.aug.in b/src/libxl/test_libvirtd_libxl.aug.in index 372a43f94a..ac37de67eb 100644 --- a/src/libxl/test_libvirtd_libxl.aug.in +++ b/src/libxl/test_libvirtd_libxl.aug.in @@ -1,5 +1,5 @@ module Test_libvirtd_libxl = - ::CONFIG:: + @CONFIG@ test Libvirtd_libxl.lns get conf = { "autoballoon" = "1" } diff --git a/src/locking/test_libvirt_lockd.aug.in b/src/locking/test_libvirt_lockd.aug.in index 52b37541cb..0f3b57eb34 100644 --- a/src/locking/test_libvirt_lockd.aug.in +++ b/src/locking/test_libvirt_lockd.aug.in @@ -1,5 +1,5 @@ module Test_libvirt_lockd = - ::CONFIG:: + @CONFIG@ test Libvirt_lockd.lns get conf = { "auto_disk_leases" = "0" } diff --git a/src/locking/test_libvirt_sanlock.aug.in b/src/locking/test_libvirt_sanlock.aug.in index 7f66f8192b..5eabb6726d 100644 --- a/src/locking/test_libvirt_sanlock.aug.in +++ b/src/locking/test_libvirt_sanlock.aug.in @@ -1,5 +1,5 @@ module Test_libvirt_sanlock = - ::CONFIG:: + @CONFIG@ test Libvirt_sanlock.lns get conf = { "auto_disk_leases" = "1" } diff --git a/src/locking/test_virtlockd.aug.in b/src/locking/test_virtlockd.aug.in index f2f6979ef5..fad0c418b9 100644 --- a/src/locking/test_virtlockd.aug.in +++ b/src/locking/test_virtlockd.aug.in @@ -1,5 +1,5 @@ module Test_virtlockd = - ::CONFIG:: + @CONFIG@ test Virtlockd.lns get conf = { "log_level" = "3" } diff --git a/src/logging/test_virtlogd.aug.in b/src/logging/test_virtlogd.aug.in index a29e7e3730..cd5b0d91f8 100644 --- a/src/logging/test_virtlogd.aug.in +++ b/src/logging/test_virtlogd.aug.in @@ -1,5 +1,5 @@ module Test_virtlogd = - ::CONFIG:: + @CONFIG@ test Virtlogd.lns get conf = { "log_level" = "3" } diff --git a/src/lxc/test_libvirtd_lxc.aug.in b/src/lxc/test_libvirtd_lxc.aug.in index 3eb25aa292..68db2e1c86 100644 --- a/src/lxc/test_libvirtd_lxc.aug.in +++ b/src/lxc/test_libvirtd_lxc.aug.in @@ -1,5 +1,5 @@ module Test_libvirtd_lxc = - ::CONFIG:: + @CONFIG@ test Libvirtd_lxc.lns get conf = { "log_with_libvirtd" = "1" } diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index b3b44d42d9..9f81759cb5 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -1,5 +1,5 @@ module Test_libvirtd_qemu = - ::CONFIG:: + @CONFIG@ test Libvirtd_qemu.lns get conf = { "default_tls_x509_cert_dir" = "/etc/pki/qemu" } diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug.in index ad6450a569..6c51b7b9e7 100644 --- a/src/remote/test_libvirtd.aug.in +++ b/src/remote/test_libvirtd.aug.in @@ -1,5 +1,5 @@ module Test_libvirtd = - ::CONFIG:: + @CONFIG@ test Libvirtd.lns get conf = { "listen_tls" = "0" } -- 2.21.0