aboutsummaryrefslogtreecommitdiffstats
path: root/libosmocore
diff options
context:
space:
mode:
authorHarald Welte <laforge@netfilter.org>2010-02-20 17:29:27 +0100
committerHarald Welte <laforge@netfilter.org>2010-02-20 17:29:27 +0100
commitf98a4974d764a4b6f8da5a8a5cadacae83eb87b7 (patch)
tree3f9ec8b17bbaaa3429caab7ee504d996373b38a9 /libosmocore
parentdfe6c7d910edbba238751d0cfddbb627bb08ef54 (diff)
finish openbsc / libosmocore separation
* use pkg-config from openbsc to find header and library * move sms and timer tests to libosmocore itself * ensure "make distcheck" works on both packages
Diffstat (limited to 'libosmocore')
-rw-r--r--libosmocore/Makefile.am2
-rw-r--r--libosmocore/configure.in3
-rw-r--r--libosmocore/include/osmocore/Makefile.am6
-rw-r--r--libosmocore/libosmocore.pc.in3
-rw-r--r--libosmocore/tests/Makefile.am1
-rw-r--r--libosmocore/tests/sms/Makefile.am5
-rw-r--r--libosmocore/tests/sms/sms_test.c47
-rw-r--r--libosmocore/tests/timer/Makefile.am6
-rw-r--r--libosmocore/tests/timer/timer_test.c70
9 files changed, 139 insertions, 4 deletions
diff --git a/libosmocore/Makefile.am b/libosmocore/Makefile.am
index 6bda10a1..8007b745 100644
--- a/libosmocore/Makefile.am
+++ b/libosmocore/Makefile.am
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
INCLUDES = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = include src
+SUBDIRS = include src tests
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libosmocore.pc
diff --git a/libosmocore/configure.in b/libosmocore/configure.in
index 8c0fe672..d9fa6e81 100644
--- a/libosmocore/configure.in
+++ b/libosmocore/configure.in
@@ -34,4 +34,7 @@ AC_OUTPUT(
include/osmocore/Makefile
include/Makefile
src/Makefile
+ tests/Makefile
+ tests/timer/Makefile
+ tests/sms/Makefile
Makefile)
diff --git a/libosmocore/include/osmocore/Makefile.am b/libosmocore/include/osmocore/Makefile.am
index aec27d19..189c7676 100644
--- a/libosmocore/include/osmocore/Makefile.am
+++ b/libosmocore/include/osmocore/Makefile.am
@@ -1,2 +1,4 @@
-pkginclude_HEADERS = signal.h linuxlist.h timer.h talloc.h msgb.h select.h \
- tlv.h bitvec.h comp128.h statistics.h gsm_utils.h
+osmocore_HEADERS = signal.h linuxlist.h timer.h talloc.h msgb.h select.h \
+ tlv.h bitvec.h comp128.h statistics.h gsm_utils.h utils.h
+
+osmocoredir = $(includedir)/osmocore
diff --git a/libosmocore/libosmocore.pc.in b/libosmocore/libosmocore.pc.in
index 0d09cb82..7c298693 100644
--- a/libosmocore/libosmocore.pc.in
+++ b/libosmocore/libosmocore.pc.in
@@ -1,4 +1,5 @@
-prefix=@exec_prefix@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
diff --git a/libosmocore/tests/Makefile.am b/libosmocore/tests/Makefile.am
new file mode 100644
index 00000000..56e8b6f6
--- /dev/null
+++ b/libosmocore/tests/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = timer sms
diff --git a/libosmocore/tests/sms/Makefile.am b/libosmocore/tests/sms/Makefile.am
new file mode 100644
index 00000000..a8f1ff6a
--- /dev/null
+++ b/libosmocore/tests/sms/Makefile.am
@@ -0,0 +1,5 @@
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
+noinst_PROGRAMS = sms_test
+
+sms_test_SOURCES = sms_test.c
+sms_test_LDADD = $(top_builddir)/src/libosmocore.la
diff --git a/libosmocore/tests/sms/sms_test.c b/libosmocore/tests/sms/sms_test.c
new file mode 100644
index 00000000..106635ff
--- /dev/null
+++ b/libosmocore/tests/sms/sms_test.c
@@ -0,0 +1,47 @@
+/*
+ * (C) 2008 by Daniel Willmann <daniel@totalueberwachung.de>
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <osmocore/msgb.h>
+#include <osmocore/gsm_utils.h>
+
+int main(int argc, char** argv)
+{
+ printf("SMS testing\n");
+ struct msgb *msg;
+ u_int8_t *sms;
+ u_int8_t i;
+
+ /* test 7-bit coding/decoding */
+ const char *input = "test text";
+ u_int8_t length;
+ u_int8_t coded[256];
+ char result[256];
+
+ length = gsm_7bit_encode(coded, input);
+ gsm_7bit_decode(result, coded, length);
+ if (strcmp(result, input) != 0) {
+ printf("7 Bit coding failed... life sucks\n");
+ printf("Wanted: '%s' got '%s'\n", input, result);
+ }
+}
diff --git a/libosmocore/tests/timer/Makefile.am b/libosmocore/tests/timer/Makefile.am
new file mode 100644
index 00000000..d3decf55
--- /dev/null
+++ b/libosmocore/tests/timer/Makefile.am
@@ -0,0 +1,6 @@
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
+noinst_PROGRAMS = timer_test
+
+timer_test_SOURCES = timer_test.c
+timer_test_LDADD = $(top_builddir)/src/libosmocore.la
+
diff --git a/libosmocore/tests/timer/timer_test.c b/libosmocore/tests/timer/timer_test.c
new file mode 100644
index 00000000..ec29ef04
--- /dev/null
+++ b/libosmocore/tests/timer/timer_test.c
@@ -0,0 +1,70 @@
+/*
+ * (C) 2008 by Holger Hans Peter Freyther <zecke@selfish.org>
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <stdio.h>
+
+#include <osmocore/timer.h>
+#include <osmocore/select.h>
+
+static void timer_fired(unsigned long data);
+
+static struct timer_list timer_one = {
+ .cb = timer_fired,
+ .data = (void*)1,
+};
+
+static struct timer_list timer_two = {
+ .cb = timer_fired,
+ .data = (void*)2,
+};
+
+static struct timer_list timer_three = {
+ .cb = timer_fired,
+ .data = (void*)3,
+};
+
+static void timer_fired(unsigned long data)
+{
+ printf("Fired timer: %lu\n", data);
+
+ if (data == 1) {
+ bsc_schedule_timer(&timer_one, 3, 0);
+ bsc_del_timer(&timer_two);
+ } else if (data == 2) {
+ printf("Should not be fired... bug in del_timer\n");
+ } else if (data == 3) {
+ printf("Timer fired not registering again\n");
+ } else {
+ printf("wtf... wrong data\n");
+ }
+}
+
+int main(int argc, char** argv)
+{
+ printf("Starting... timer\n");
+
+ bsc_schedule_timer(&timer_one, 3, 0);
+ bsc_schedule_timer(&timer_two, 5, 0);
+ bsc_schedule_timer(&timer_three, 4, 0);
+
+ while (1) {
+ bsc_select_main(0);
+ }
+}