summaryrefslogtreecommitdiff
path: root/libnm/tests
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-02-19 14:57:48 +0100
committerThomas Haller <thaller@redhat.com>2016-02-19 17:53:25 +0100
commit8bace23bebcc28396460663203d54aac4ec8ffbf (patch)
tree1655434d48980dbb4a547f6d56a231252aa0181d /libnm/tests
parent89d6fa6aa93cdc982992c137f0b694cd339c315c (diff)
downloadNetworkManager-8bace23bebcc28396460663203d54aac4ec8ffbf.tar.gz
all: cleanup includes and let "nm-default.h" include "config.h"
- All internal source files (except "examples", which are not internal) should include "config.h" first. As also all internal source files should include "nm-default.h", let "config.h" be included by "nm-default.h" and include "nm-default.h" as first in every source file. We already wanted to include "nm-default.h" before other headers because it might contains some fixes (like "nm-glib.h" compatibility) that is required first. - After including "nm-default.h", we optinally allow for including the corresponding header file for the source file at hand. The idea is to ensure that each header file is self contained. - Don't include "config.h" or "nm-default.h" in any header file (except "nm-sd-adapt.h"). Public headers anyway must not include these headers, and internal headers are never included after "nm-default.h", as of the first previous point. - Include all internal headers with quotes instead of angle brackets. In practice it doesn't matter, because in our public headers we must include other headers with angle brackets. As we use our public headers also to compile our interal source files, effectively the result must be the same. Still do it for consistency. - Except for <config.h> itself. Include it with angle brackets as suggested by https://www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Headers
Diffstat (limited to 'libnm/tests')
-rw-r--r--libnm/tests/test-nm-client.c2
-rw-r--r--libnm/tests/test-remote-settings-client.c2
-rw-r--r--libnm/tests/test-secret-agent.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 70e93acc23..9e9d480eaf 100644
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -18,7 +18,7 @@
*
*/
-#include "config.h"
+#include "nm-default.h"
#include <string.h>
#include <sys/types.h>
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index 1a3c7988a2..8f59656d75 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -18,7 +18,7 @@
*
*/
-#include "config.h"
+#include "nm-default.h"
#include <string.h>
#include <sys/types.h>
diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c
index f8aedd2368..9756186681 100644
--- a/libnm/tests/test-secret-agent.c
+++ b/libnm/tests/test-secret-agent.c
@@ -18,13 +18,13 @@
*
*/
-#include "config.h"
+#include "nm-default.h"
#include <string.h>
#include <sys/types.h>
#include <signal.h>
-#include <nm-secret-agent-old.h>
+#include "nm-secret-agent-old.h"
#include "nm-test-libnm-utils.h"