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@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl
index faf2fd593eb0a8e4de0b40e3c77425a572b36c5d..65834b533b2ed9d03a2103c315718c254681a47a 100755 (executable)
--- 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 f28e58614dacf344d572e150b528791f1edfa339..ec932b4b11dcbfd5ef9a4d39ca128c9b64de5811 100644 (file)
--- 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 372a43f94ab5c5b9685d912a82d25fae1fea997a..ac37de67eb59bda744ab2fdfa5231d150109c299 100644 (file)
--- 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 52b37541cbae05cc3173016f10e16b7a1bbfb32b..0f3b57eb343a3e2ca58cd885a9617b18959553b0 100644 (file)
--- 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 7f66f8192bea01890c42298b53f777d69c7def33..5eabb6726de4f3bf62fa8e462a426b118f59c4ff 100644 (file)
--- 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 f2f6979ef514312ce6455fb9edcbe9c48dcb16e5..fad0c418b96059fd1789bd4f648b5cabcd160498 100644 (file)
--- 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 a29e7e37305d5e36d080a084df8caeac8d40e697..cd5b0d91f8690f8c82d261fcac42d4ec11c9f818 100644 (file)
--- 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 3eb25aa29268e637ef29fe17cfb3584098bb2c8b..68db2e1c864e6e01fcdf5c1f4ac86980c3040e8b 100644 (file)
--- 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 b3b44d42d95ed83047da9793df2f014daf191919..9f81759cb50903250574106640ca6ba810985280 100644 (file)
--- 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 ad6450a569d30878122fe43698d013de8629ce03..6c51b7b9e77c3fd482ba706f56e0104503a07b51 100644 (file)
--- 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" }