[network-manager-openvpn/th/include-nm-default-bgo761198: 7/7] all: move "nm-test-helper.c" to "shared/nm-test-utils.h"

[Thomas Haller <thaller src gnome org>]

commit 72fb6997a94cb3dcd7786e5f3cc861b85c4290c2
Author: Thomas Haller <thaller redhat com>
Date:   Wed Jan 27 18:17:14 2016 +0100

    all: move "nm-test-helper.c" to "shared/nm-test-utils.h"
    
    This mirrors the file layout in the NetworkManager project.

 Makefile.am                                 |    3 +--
 properties/tests/Makefile.am                |    1 -
 properties/tests/test-import-export.c       |    3 ++-
 shared/Makefile.am                          |    3 ++-
 nm-test-helpers.h => shared/nm-test-utils.h |    0
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7903cd9..26a4ba0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,8 +30,7 @@ EXTRA_DIST = nm-openvpn-service.name.in \
              $(dbusservice_DATA)  \
              intltool-extract.in  \
              intltool-merge.in    \
-             intltool-update.in \
-             nm-test-helpers.h
+             intltool-update.in
 
 CLEANFILES = $(nmvpnservice_DATA) *~
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index a585e08..a7f1b63 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = conf
 
 AM_CFLAGS = \
     -I${top_srcdir}/shared \
-    -I${top_srcdir} \
     -I${top_srcdir}/properties
 
 noinst_PROGRAMS = test-import-export
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index 8be6c46..e6d18fd 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -27,10 +27,11 @@
 
 #include "nm-default.h"
 
-#include "nm-test-helpers.h"
 #include "nm-openvpn.h"
 #include "nm-openvpn-service-defines.h"
 
+#include "nm-test-utils.h"
+
 static NMConnection *
 get_basic_connection (const char *detail,
                       NMVpnEditorPlugin *plugin,
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 9ec51ea..fa4edd5 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -31,5 +31,6 @@ EXTRA_DIST = \
      nm-dbus-compat.h \
      nm-default.h \
      nm-glib.h \
-     nm-macros-internal.h
+     nm-macros-internal.h \
+     nm-test-utils.h
 
diff --git a/nm-test-helpers.h b/shared/nm-test-utils.h
similarity index 100%
rename from nm-test-helpers.h
rename to shared/nm-test-utils.h