From: Daniel Wagner <[email protected]>
test-ippool is a pure unit test can therefore be part of the
distcheck target.
---
Makefile.am | 16 +++++++---------
unit/test-ippool.c | 16 ++++++++--------
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 55b0bba..5d5f63a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -240,7 +240,7 @@ client_connmanctl_SOURCES = $(gdbus_sources) src/connman.h
\
client_connmanctl_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ -lreadline -ldl
endif
-noinst_PROGRAMS += unit/test-pbkdf2-sha1 unit/test-prf-sha1
+noinst_PROGRAMS += unit/test-pbkdf2-sha1 unit/test-prf-sha1 unit/test-ippool
unit_test_pbkdf2_sha1_SOURCES = unit/test-pbkdf2-sha1.c \
src/shared/sha1.h src/shared/sha1.c
@@ -250,7 +250,11 @@ unit_test_prf_sha1_SOURCES = unit/test-prf-sha1.c \
src/shared/sha1.h src/shared/sha1.c
unit_test_prf_sha1_LDADD = @GLIB_LIBS@
-TESTS = unit/test-pbkdf2-sha1 unit/test-prf-sha1
+unit_test_ippool_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
+ src/ippool.c unit/test-ippool.c
+unit_test_ippool_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl
+
+TESTS = unit/test-pbkdf2-sha1 unit/test-prf-sha1 unit/test-ippool
if WISPR
noinst_PROGRAMS += tools/wispr
@@ -266,8 +270,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 \
- tools/session-test unit/test-ippool \
- tools/iptables-unit
+ tools/session-test tools/iptables-unit
tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
tools/supplicant-dbus.h tools/supplicant-dbus.c \
@@ -306,11 +309,6 @@ tools_session_test_SOURCES = $(gdbus_sources) src/log.c
src/dbus.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
-unit_test_ippool_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl
-unit_objects += $(unit_test_ippool_OBJECTS)
-
tools_iptables_unit_SOURCES = $(gdbus_sources) src/log.c \
src/iptables.c src/nat.c tools/iptables-unit.c
tools_iptables_unit_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ -ldl
diff --git a/unit/test-ippool.c b/unit/test-ippool.c
index 2df8561..07456d5 100644
--- a/unit/test-ippool.c
+++ b/unit/test-ippool.c
@@ -39,7 +39,7 @@
#define LOG(fmt, arg...)
#endif
-static void test_ippool_basic0(void)
+static void test_case_1(void)
{
struct connman_ippool *pool;
int i;
@@ -59,7 +59,7 @@ static void test_ippool_basic0(void)
__connman_ippool_cleanup();
}
-static void test_ippool_basic1(void)
+static void test_case_2(void)
{
struct connman_ippool *pool;
const char *gateway;
@@ -98,7 +98,7 @@ static void test_ippool_basic1(void)
__connman_ippool_cleanup();
}
-static void test_ippool_exhaust0(void)
+static void test_case_3(void)
{
struct connman_ippool *pool;
const char *gateway;
@@ -171,7 +171,7 @@ static void collision_cb(struct connman_ippool *pool, void
*user_data)
*flag = 1;
}
-static void test_ippool_collision0(void)
+static void test_case_4(void)
{
struct connman_ippool *pool;
const char *gateway;
@@ -249,10 +249,10 @@ int main(int argc, char *argv[])
{
g_test_init(&argc, &argv, NULL);
- g_test_add_func("/basic0", test_ippool_basic0);
- g_test_add_func("/basic1", test_ippool_basic1);
- g_test_add_func("/exhaust0", test_ippool_exhaust0);
- g_test_add_func("/collision0", test_ippool_collision0);
+ g_test_add_func("/ippool/Test case 1", test_case_1);
+ g_test_add_func("/ippool/Test case 2", test_case_2);
+ g_test_add_func("/ippool/Test case 3", test_case_3);
+ g_test_add_func("/ippool/Test case 4", test_case_4);
return g_test_run();
}
--
1.8.2.rc3.16.gce432ca
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
