diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2013-03-12 18:16:33 +0100 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2013-03-18 14:31:25 +0200 |
| commit | 516813cd4372bef22681137adf9d13c985bb7b99 (patch) | |
| tree | 970abceba43d30f6b31838aa70c54345e818bfa5 | |
| parent | 1838dd68416a52ab47b9c7e42f4442c093989174 (diff) | |
| download | connman-516813cd4372bef22681137adf9d13c985bb7b99.tar.gz connman-516813cd4372bef22681137adf9d13c985bb7b99.tar.bz2 connman-516813cd4372bef22681137adf9d13c985bb7b99.zip | |
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.
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | tools/manager-api.c (renamed from unit/manager-api.c) | 2 | ||||
| -rw-r--r-- | tools/session-api.c (renamed from unit/session-api.c) | 2 | ||||
| -rw-r--r-- | tools/session-test.c (renamed from unit/test-session.c) | 2 | ||||
| -rw-r--r-- | tools/session-test.h (renamed from unit/test-connman.h) | 0 | ||||
| -rw-r--r-- | tools/session-utils.c (renamed from unit/utils.c) | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 8b302758..87211230 100644 --- 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 index 40ad3704..2a182d7f 100644 --- 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 index 52d2544e..72c0b09d 100644 --- 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 index d6da8d71..c296b95c 100644 --- 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 index a21f5269..a21f5269 100644 --- a/unit/test-connman.h +++ b/tools/session-test.h diff --git a/unit/utils.c b/tools/session-utils.c index 7597855c..6a3d9918 100644 --- 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" |