And confdata to virconfdata, since 'conf' can mean a few different
things in libvirt
---
cfg.mk | 2 +-
tests/Makefile.am | 12 ++++++------
tests/{confdata => virconfdata}/fc4.conf | 0
tests/{confdata => virconfdata}/fc4.out | 0
tests/{confdata => virconfdata}/libvirtd.conf | 0
tests/{confdata => virconfdata}/libvirtd.out | 0
tests/{confdata => virconfdata}/no-newline.conf | 0
tests/{confdata => virconfdata}/no-newline.out | 0
tests/{test_conf.c => virconftest.c} | 0
tests/{test_conf.sh => virconftest.sh} | 0
10 files changed, 7 insertions(+), 7 deletions(-)
rename tests/{confdata => virconfdata}/fc4.conf (100%)
rename tests/{confdata => virconfdata}/fc4.out (100%)
rename tests/{confdata => virconfdata}/libvirtd.conf (100%)
rename tests/{confdata => virconfdata}/libvirtd.out (100%)
rename tests/{confdata => virconfdata}/no-newline.conf (100%)
rename tests/{confdata => virconfdata}/no-newline.out (100%)
rename tests/{test_conf.c => virconftest.c} (100%)
rename tests/{test_conf.sh => virconftest.sh} (100%)
diff --git a/cfg.mk b/cfg.mk
index 09ff9fa..cc5ea9e 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1179,7 +1179,7 @@ exclude_file_name_regexp--sc_prohibit_close = \
(\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/vir.+mock\.c)$$)
exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
-
(^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.diff|tests/confdata/no-newline\.conf$$)
+
(^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.diff|tests/virconfdata/no-newline\.conf$$)
_src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon|logging/log_daemon)
exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index edf7b22..a803e84 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -81,7 +81,6 @@ EXTRA_DIST = \
capabilityschemadata \
capabilityschematest \
commanddata \
- confdata \
cputestdata \
domaincapsschemadata \
domaincapsschematest \
@@ -142,6 +141,7 @@ EXTRA_DIST = \
vboxsnapshotxmldata \
vircaps2xmldata \
vircgroupdata \
+ virconfdata \
virfiledata \
virmock.h \
virnetdaemondata \
@@ -158,7 +158,7 @@ EXTRA_DIST = \
xml2sexprdata \
xml2vmxdata
-test_helpers = commandhelper ssh test_conf
+test_helpers = commandhelper ssh virconftest
test_programs = virshtest sockettest \
nodeinfotest virbuftest \
commandtest seclabeltest \
@@ -370,7 +370,7 @@ test_scripts = \
libvirtd_test_scripts = \
libvirtd-fail \
libvirtd-pool \
- test_conf.sh \
+ virconftest.sh \
virsh-all \
virsh-cpuset \
virsh-define-dev-segfault \
@@ -857,9 +857,9 @@ virshtest_SOURCES = \
testutils.c testutils.h
virshtest_LDADD = $(LDADDS)
-test_conf_SOURCES = \
- test_conf.c
-test_conf_LDADD = $(LDADDS)
+virconftest_SOURCES = \
+ virconftest.c
+virconftest_LDADD = $(LDADDS)
nodeinfotest_SOURCES = \
nodeinfotest.c testutils.h testutils.c
diff --git a/tests/confdata/fc4.conf b/tests/virconfdata/fc4.conf
similarity index 100%
rename from tests/confdata/fc4.conf
rename to tests/virconfdata/fc4.conf
diff --git a/tests/confdata/fc4.out b/tests/virconfdata/fc4.out
similarity index 100%
rename from tests/confdata/fc4.out
rename to tests/virconfdata/fc4.out
diff --git a/tests/confdata/libvirtd.conf b/tests/virconfdata/libvirtd.conf
similarity index 100%
rename from tests/confdata/libvirtd.conf
rename to tests/virconfdata/libvirtd.conf
diff --git a/tests/confdata/libvirtd.out b/tests/virconfdata/libvirtd.out
similarity index 100%
rename from tests/confdata/libvirtd.out
rename to tests/virconfdata/libvirtd.out
diff --git a/tests/confdata/no-newline.conf b/tests/virconfdata/no-newline.conf
similarity index 100%
rename from tests/confdata/no-newline.conf
rename to tests/virconfdata/no-newline.conf
diff --git a/tests/confdata/no-newline.out b/tests/virconfdata/no-newline.out
similarity index 100%
rename from tests/confdata/no-newline.out
rename to tests/virconfdata/no-newline.out
diff --git a/tests/test_conf.c b/tests/virconftest.c
similarity index 100%
rename from tests/test_conf.c
rename to tests/virconftest.c
diff --git a/tests/test_conf.sh b/tests/virconftest.sh
similarity index 100%
rename from tests/test_conf.sh
rename to tests/virconftest.sh
--
2.7.3
--
libvir-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/libvir-list
