test-session: Move file to tools and rename it to session-test

These tests depens on ConnMan running and therefore not really a
unit tests. Let's move it to tools.

diff --git a/Makefile.am b/Makefile.am
index 8b30275..8721123 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -266,7 +266,7 @@ noinst_PROGRAMS += tools/supplicant-test \
                        tools/dbus-test tools/polkit-test \
                        tools/iptables-test tools/tap-test tools/wpad-test \
                        tools/stats-tool tools/private-network-test \
-                       unit/test-session unit/test-ippool \
+                       tools/session-test unit/test-ippool \
                        tools/iptables-unit
 
 tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
@@ -300,11 +300,10 @@ tools_iptables_test_LDADD = @GLIB_LIBS@ @XTABLES_LIBS@
 
 tools_private_network_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 
-unit_test_session_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
-               unit/test-session.c unit/utils.c unit/manager-api.c \
-               unit/session-api.c unit/test-connman.h
-unit_test_session_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl
-unit_objects += $(unit_test_session_OBJECTS)
+tools_session_test_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
+               tools/session-test.c tools/session-utils.c tools/manager-api.c \
+               tools/session-api.c tools/session-test.h
+tools_session_test_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl
 
 unit_test_ippool_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
                 src/ippool.c unit/test-ippool.c

diff --git a/unit/manager-api.c b/tools/manager-api.c
similarity index 99%
rename from unit/manager-api.c
rename to tools/manager-api.c
index 40ad370..2a182d7 100644 (file)
--- a/unit/manager-api.c
+++ b/tools/manager-api.c
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#include "test-connman.h"
+#include "session-test.h"
 
 static DBusMessage *set_property(DBusConnection *connection,
                                const char *property, int type, void *value)

diff --git a/unit/session-api.c b/tools/session-api.c
similarity index 99%
rename from unit/session-api.c
rename to tools/session-api.c
index 52d2544..72c0b09 100644 (file)
--- a/unit/session-api.c
+++ b/tools/session-api.c
@@ -27,7 +27,7 @@
 
 #include <gdbus.h>
 
-#include "test-connman.h"
+#include "session-test.h"
 
 static enum connman_session_state string2state(const char *state)
 {

diff --git a/unit/test-session.c b/tools/session-test.c
similarity index 99%
rename from unit/test-session.c
rename to tools/session-test.c
index d6da8d7..c296b95 100644 (file)
--- a/unit/test-session.c
+++ b/tools/session-test.c
@@ -27,7 +27,7 @@
 
 #include <gdbus.h>
 
-#include "test-connman.h"
+#include "session-test.h"
 
 enum test_session_state {
        TEST_SESSION_STATE_0 = 0,

diff --git a/unit/test-connman.h b/tools/session-test.h
similarity index 100%
rename from unit/test-connman.h
rename to tools/session-test.h

diff --git a/unit/utils.c b/tools/session-utils.c
similarity index 99%
rename from unit/utils.c
rename to tools/session-utils.c
index 7597855..6a3d991 100644 (file)
--- a/unit/utils.c
+++ b/tools/session-utils.c
@@ -27,7 +27,7 @@
 
 #include <gdbus.h>
 
-#include "test-connman.h"
+#include "session-test.h"
 
 #define ENABLE_WRAPPER 1
 #define PROPERTY_CHANGED               "PropertyChanged"