From a378188194884e8c2d463073d4cd7fa4c1d00d25 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 29 Jan 2008 18:15:54 +0000 Subject: [PATCH] Enable the -requiring test; fix violations Use , not "config.h", per autoconf documentation. * Makefile.cfg (local-checks-to-skip) [sc_require_config_h]: Enable. * .x-sc_require_config_h: New file, to list exempted files. * Makefile.am (EXTRA_DIST): Add .x-sc_require_config_h. --- .x-sc_require_config_h | 6 ++++++ ChangeLog | 6 ++++++ Makefile.am | 3 ++- Makefile.cfg | 1 - proxy/libvirt_proxy.c | 2 +- python/libvir.c | 2 +- python/types.c | 2 +- qemud/event.c | 2 +- qemud/qemud.c | 2 +- src/bridge.h | 2 +- src/buf.c | 2 +- src/conf.c | 2 +- src/console.c | 2 +- src/event.c | 2 +- src/gnutls_1_0_compat.h | 2 +- src/hash.c | 2 +- src/iptables.c | 2 +- src/libvirt.c | 2 +- src/nodeinfo.c | 2 +- src/openvz_conf.c | 2 +- src/proxy_internal.c | 2 +- src/qemu_conf.c | 2 +- src/qemu_conf.h | 2 +- src/qemu_driver.c | 2 +- src/qemu_driver.h | 2 +- src/remote_internal.c | 2 +- src/sexpr.c | 2 +- src/stats_linux.c | 2 +- src/test.c | 2 +- src/util.c | 2 +- src/uuid.c | 2 +- src/virsh.c | 2 +- src/virterror.c | 2 +- src/xen_internal.c | 2 +- src/xen_unified.c | 2 +- src/xend_internal.c | 2 +- src/xm_internal.c | 2 +- src/xml.c | 2 +- src/xmlrpc.c | 2 +- src/xs_internal.c | 2 +- tests/conftest.c | 2 +- tests/nodeinfotest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tests/reconnect.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/testutils.c | 2 +- tests/virshtest.c | 2 +- tests/xencapstest.c | 2 +- tests/xmconfigtest.c | 2 +- tests/xml2sexprtest.c | 2 +- tests/xmlrpctest.c | 2 +- 52 files changed, 62 insertions(+), 50 deletions(-) create mode 100644 .x-sc_require_config_h diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h new file mode 100644 index 0000000000..65b0d81eaa --- /dev/null +++ b/.x-sc_require_config_h @@ -0,0 +1,6 @@ +^docs/examples/info1\.c$ +^docs/examples/suspend\.c$ +^gnulib/lib/dummy\.c$ +^gnulib/tests/dummy\.c$ +^qemud/remote_protocol\.c$ +^ChangeLog$ diff --git a/ChangeLog b/ChangeLog index aebe54da9b..85dcf561bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ Tue Jan 29 18:39:25 CET 2008 Jim Meyering + Enable the -requiring test; fix violations + Use , not "config.h", per autoconf documentation. + * Makefile.cfg (local-checks-to-skip) [sc_require_config_h]: Enable. + * .x-sc_require_config_h: New file, to list exempted files. + * Makefile.am (EXTRA_DIST): Add .x-sc_require_config_h. + Enable the duplicate-"the" test; fix violations * Makefile.cfg (local-checks-to-skip) [sc_the_the]: Enable. * docs/virsh.pod: Remove a duplicate "the". diff --git a/Makefile.am b/Makefile.am index 5154203723..e32033a4d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,8 @@ EXTRA_DIST = \ libvirt.spec libvirt.spec.in \ libvirt.pc libvirt.pc.in \ $(man_MANS) autobuild.sh \ - .x-sc_avoid_if_before_free + .x-sc_avoid_if_before_free \ + .x-sc_require_config_h man_MANS = virsh.1 diff --git a/Makefile.cfg b/Makefile.cfg index ba59f29144..2c1c9e7587 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -49,7 +49,6 @@ local-checks-to-skip = \ sc_prohibit_quote_without_use \ sc_prohibit_quotearg_without_use \ sc_prohibit_strcmp \ - sc_require_config_h \ sc_root_tests \ sc_space_tab \ sc_sun_os_names \ diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index 5ccf855988..83cf39d871 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -9,7 +9,7 @@ * Daniel Veillard */ -#include "config.h" +#include #ifdef WITH_XEN diff --git a/python/libvir.c b/python/libvir.c index 0fe11f221d..e2f7c5b384 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -9,7 +9,7 @@ * Daniel Veillard */ -#include "config.h" +#include #include #include "libvirt/libvirt.h" diff --git a/python/types.c b/python/types.c index 146bb24564..c91d8da939 100644 --- a/python/types.c +++ b/python/types.c @@ -7,7 +7,7 @@ * Daniel Veillard */ -#include "config.h" +#include #include "libvirt_wrap.h" diff --git a/qemud/event.c b/qemud/event.c index b7d75a06d4..ca7dc117b2 100644 --- a/qemud/event.c +++ b/qemud/event.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange */ -#include "config.h" +#include #include #include diff --git a/qemud/qemud.c b/qemud/qemud.c index 5f3c875eca..77a23520d9 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange */ -#include "config.h" +#include #include #include diff --git a/src/bridge.h b/src/bridge.h index 52f805bf00..5dcca00040 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -22,7 +22,7 @@ #ifndef __QEMUD_BRIDGE_H__ #define __QEMUD_BRIDGE_H__ -#include "config.h" +#include #ifdef WITH_QEMU diff --git a/src/buf.c b/src/buf.c index 188d040fb2..5bb2bd45bd 100644 --- a/src/buf.c +++ b/src/buf.c @@ -8,7 +8,7 @@ * Daniel Veillard */ -#include "config.h" +#include #include "libvirt/libvirt.h" diff --git a/src/conf.c b/src/conf.c index 8e66d845e9..8b3aae5789 100644 --- a/src/conf.c +++ b/src/conf.c @@ -8,7 +8,7 @@ * Daniel Veillard */ -#include "config.h" +#include #include diff --git a/src/console.c b/src/console.c index 6b336d98a7..02a9c7f330 100644 --- a/src/console.c +++ b/src/console.c @@ -20,7 +20,7 @@ * Daniel Berrange */ -#include "config.h" +#include #ifndef __MINGW32__ diff --git a/src/event.c b/src/event.c index 7dcbf3211e..274db9de3f 100644 --- a/src/event.c +++ b/src/event.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange */ -#include "config.h" +#include #include "event.h" diff --git a/src/gnutls_1_0_compat.h b/src/gnutls_1_0_compat.h index 7ec8b63823..38f69543d1 100644 --- a/src/gnutls_1_0_compat.h +++ b/src/gnutls_1_0_compat.h @@ -22,7 +22,7 @@ #ifndef LIBVIRT_GNUTLS_1_0_COMPAT_H__ -#include "config.h" +#include #ifdef GNUTLS_1_0_COMPAT #define gnutls_session_t gnutls_session diff --git a/src/hash.c b/src/hash.c index 4e4ce60cf3..d92c92cb7a 100644 --- a/src/hash.c +++ b/src/hash.c @@ -18,7 +18,7 @@ * Daniel Veillard */ -#include "config.h" +#include #include #include diff --git a/src/iptables.c b/src/iptables.c index b59faa454a..148641184e 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -19,7 +19,7 @@ * Mark McLoughlin */ -#include "config.h" +#include #if WITH_QEMU diff --git a/src/libvirt.c b/src/libvirt.c index f4ee2e0b91..defadc19ef 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9,7 +9,7 @@ * Daniel Veillard */ -#include "config.h" +#include #include "libvirt/libvirt.h" #include diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 1b0191b402..65a2cf140d 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange */ -#include "config.h" +#include #include #include diff --git a/src/openvz_conf.c b/src/openvz_conf.c index 4e4019c446..9084184587 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -27,7 +27,7 @@ #ifdef WITH_OPENVZ -#include "config.h" +#include #include #include diff --git a/src/proxy_internal.c b/src/proxy_internal.c index e0e5631d14..a8a7962134 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -10,7 +10,7 @@ #ifdef WITH_XEN -#include "config.h" +#include #include #include diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 0de641d589..9886300000 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange */ -#include "config.h" +#include #ifdef WITH_QEMU diff --git a/src/qemu_conf.h b/src/qemu_conf.h index 7b242f7c75..9f09ec1d15 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -24,7 +24,7 @@ #ifndef __QEMUD_CONF_H #define __QEMUD_CONF_H -#include "config.h" +#include #ifdef WITH_QEMU diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 71a31254b0..f80a121a9c 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -21,7 +21,7 @@ * Author: Daniel P. Berrange */ -#include "config.h" +#include #ifdef WITH_QEMU diff --git a/src/qemu_driver.h b/src/qemu_driver.h index 66b60b7058..72b397c6e0 100644 --- a/src/qemu_driver.h +++ b/src/qemu_driver.h @@ -25,7 +25,7 @@ #ifndef QEMUD_DRIVER_H #define QEMUD_DRIVER_H -#include "config.h" +#include #ifdef WITH_QEMU diff --git a/src/remote_internal.c b/src/remote_internal.c index 4d855abe83..aa6bb5c757 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -21,7 +21,7 @@ * Author: Richard Jones */ -#include "config.h" +#include /* Windows socket compatibility functions. */ #include "socketcompat.h" diff --git a/src/sexpr.c b/src/sexpr.c index bbf0791b13..e7ea6c88c0 100644 --- a/src/sexpr.c +++ b/src/sexpr.c @@ -10,7 +10,7 @@ * archive for more details. */ -#include "config.h" +#include #include #include diff --git a/src/stats_linux.c b/src/stats_linux.c index de73cef4cb..d2dda88aec 100644 --- a/src/stats_linux.c +++ b/src/stats_linux.c @@ -8,7 +8,7 @@ * Richard W.M. Jones */ -#include "config.h" +#include /* This file only applies on Linux. */ #ifdef __linux__ diff --git a/src/test.c b/src/test.c index d39207f355..2afd86fd71 100644 --- a/src/test.c +++ b/src/test.c @@ -21,7 +21,7 @@ * Daniel Berrange */ -#include "config.h" +#include #ifdef WITH_TEST diff --git a/src/util.c b/src/util.c index f16aaf49f4..0c42124279 100644 --- a/src/util.c +++ b/src/util.c @@ -24,7 +24,7 @@ * File created Jul 18, 2007 - Shuveb Hussain */ -#include "config.h" +#include #include #include diff --git a/src/uuid.c b/src/uuid.c index b2022c493a..ae30217c76 100644 --- a/src/uuid.c +++ b/src/uuid.c @@ -19,7 +19,7 @@ * Mark McLoughlin */ -#include "config.h" +#include #include "uuid.h" diff --git a/src/virsh.c b/src/virsh.c index d08100892f..a1b3e382d6 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -13,7 +13,7 @@ * $Id$ */ -#include "config.h" +#include #include "libvirt/libvirt.h" #include "libvirt/virterror.h" diff --git a/src/virterror.c b/src/virterror.c index bf4062d3e7..83cf7ca161 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -8,7 +8,7 @@ * Author: Daniel Veillard */ -#include "config.h" +#include #include #include diff --git a/src/xen_internal.c b/src/xen_internal.c index a8cecef508..1292382ef3 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -10,7 +10,7 @@ #ifdef WITH_XEN -#include "config.h" +#include #include #include diff --git a/src/xen_unified.c b/src/xen_unified.c index d46e63b6fa..d5b2ec2adf 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -8,7 +8,7 @@ * Richard W.M. Jones */ -#include "config.h" +#include #ifdef WITH_XEN diff --git a/src/xend_internal.c b/src/xend_internal.c index 61af69b85c..814d16fda0 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -11,7 +11,7 @@ */ #ifdef WITH_XEN -#include "config.h" +#include #include #include diff --git a/src/xm_internal.c b/src/xm_internal.c index 90dc1a4298..57d0eb4d57 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -23,7 +23,7 @@ */ #ifdef WITH_XEN -#include "config.h" +#include #include #include diff --git a/src/xml.c b/src/xml.c index a546002083..76ca91cce5 100644 --- a/src/xml.c +++ b/src/xml.c @@ -8,7 +8,7 @@ * Daniel Veillard */ -#include "config.h" +#include #include "libvirt/libvirt.h" diff --git a/src/xmlrpc.c b/src/xmlrpc.c index f956f0d40e..ac4ea6e820 100644 --- a/src/xmlrpc.c +++ b/src/xmlrpc.c @@ -8,7 +8,7 @@ * Anthony Liguori */ -#include "config.h" +#include #include "xmlrpc.h" #include "internal.h" diff --git a/src/xs_internal.c b/src/xs_internal.c index 1dbbba6709..6d8610cbac 100644 --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -9,7 +9,7 @@ */ #ifdef WITH_XEN -#include "config.h" +#include #include #include diff --git a/tests/conftest.c b/tests/conftest.c index abb68fdc2e..637b737c77 100644 --- a/tests/conftest.c +++ b/tests/conftest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 969b85c5f0..c80e65c496 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 22e2e81861..56067443fc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2ab169674d..1be0e464a0 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include diff --git a/tests/reconnect.c b/tests/reconnect.c index 4c4d6489b9..e9bdcdb1e9 100644 --- a/tests/reconnect.c +++ b/tests/reconnect.c @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index 6586e92a69..c55aa4bd0b 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include diff --git a/tests/testutils.c b/tests/testutils.c index 4fea6b61a6..80b102224b 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -10,7 +10,7 @@ * $Id$ */ -#include "config.h" +#include #include #include diff --git a/tests/virshtest.c b/tests/virshtest.c index fd6dcbb2a3..676cb716ac 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include diff --git a/tests/xencapstest.c b/tests/xencapstest.c index bf9ce07528..1307d80af7 100644 --- a/tests/xencapstest.c +++ b/tests/xencapstest.c @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 51f4b675da..424eae4e5c 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -21,7 +21,7 @@ * */ -#include "config.h" +#include #include #include diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index 2d18e608b2..3118379c72 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -1,5 +1,5 @@ -#include "config.h" +#include #include #include diff --git a/tests/xmlrpctest.c b/tests/xmlrpctest.c index 5fa937fd4b..eb75f6436d 100644 --- a/tests/xmlrpctest.c +++ b/tests/xmlrpctest.c @@ -10,7 +10,7 @@ * $Id$ */ -#include "config.h" +#include #include #include