From 0c20ee6c533b62b4527525e924b04eb6a1e40fdf Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 30 Jun 2011 16:04:12 -0700
Subject: [PATCH] build: Add unit test cases to make check funtionality

---
 Makefile.am  | 33 ++++++++++++++++++---------------
 configure.ac |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b14c6646..6a2c0fe5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -534,13 +534,12 @@ EXTRA_DIST = src/genbuiltin $(udev_files) $(doc_files) $(test_scripts)
 dist_man_MANS = doc/ofonod.8
 
 
-noinst_PROGRAMS = unit/test-common unit/test-util unit/test-idmap \
-					unit/test-sms unit/test-simutil \
-					unit/test-mux unit/test-caif \
-					unit/test-stkutil unit/test-cdmasms
-
 unit_objects =
 
+check_PROGRAMS = unit/test-common unit/test-util unit/test-idmap \
+				unit/test-simutil unit/test-stkutil \
+				unit/test-sms unit/test-cdmasms
+
 unit_test_common_SOURCES = unit/test-common.c src/common.c src/util.c
 unit_test_common_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_common_OBJECTS)
@@ -553,6 +552,17 @@ unit_test_idmap_SOURCES = unit/test-idmap.c src/idmap.c
 unit_test_idmap_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_idmap_OBJECTS)
 
+unit_test_simutil_SOURCES = unit/test-simutil.c src/util.c \
+                                src/simutil.c src/smsutil.c src/storage.c
+unit_test_simutil_LDADD = @GLIB_LIBS@
+unit_objects += $(unit_test_simutil_OBJECTS)
+
+unit_test_stkutil_SOURCES = unit/test-stkutil.c src/util.c \
+                                src/storage.c src/smsutil.c \
+                                src/simutil.c src/stkutil.c
+unit_test_stkutil_LDADD = @GLIB_LIBS@
+unit_objects += $(unit_test_stkutil_OBJECTS)
+
 unit_test_sms_SOURCES = unit/test-sms.c src/util.c src/smsutil.c src/storage.c
 unit_test_sms_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_sms_OBJECTS)
@@ -561,16 +571,7 @@ unit_test_cdmasms_SOURCES = unit/test-cdmasms.c src/cdma-smsutil.c
 unit_test_cdmasms_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_cdmasms_OBJECTS)
 
-unit_test_simutil_SOURCES = unit/test-simutil.c src/util.c \
-				src/simutil.c src/smsutil.c src/storage.c
-unit_test_simutil_LDADD = @GLIB_LIBS@
-unit_objects += $(unit_test_simutil_OBJECTS)
-
-unit_test_stkutil_SOURCES = unit/test-stkutil.c src/util.c \
-				src/storage.c src/smsutil.c \
-				src/simutil.c src/stkutil.c
-unit_test_stkutil_LDADD = @GLIB_LIBS@
-unit_objects += $(unit_test_stkutil_OBJECTS)
+noinst_PROGRAMS = unit/test-mux unit/test-caif
 
 unit_test_mux_SOURCES = unit/test-mux.c $(gatchat_sources)
 unit_test_mux_LDADD = @GLIB_LIBS@
@@ -582,6 +583,8 @@ unit_test_caif_SOURCES = unit/test-caif.c $(gatchat_sources) \
 unit_test_caif_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_caif_OBJECTS)
 
+TESTS = $(check_PROGRAMS)
+
 if TOOLS
 noinst_PROGRAMS += tools/huawei-audio tools/auto-enable \
 			tools/get-location tools/lookup-apn
diff --git a/configure.ac b/configure.ac
index b9cd0e60..053679b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
 AC_INIT(ofono, 0.50)
 
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])