[PATCH 5/5] Update test suite and build infrastructure.

Max Max.Suraev at fairwaves.ru
Sun Apr 7 12:57:33 UTC 2013


---
 .gitignore             |    5 ++++-
 include/Makefile.am    |    2 ++
 src/gsm/Makefile.am    |    4 ++--
 src/gsm/libosmogsm.map |    7 +++++++
 tests/Makefile.am      |   11 +++++++++--
 tests/testsuite.at     |   12 ++++++++++++
 6 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2ed0144..e522b0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,8 @@ debian/tmp/
 debian/libosmocore*.substvars
 debian/libosmocore/
 debian/libosmocore.post*.debhelper
+debian/libosmocore-dbg/
+debian/libosmocore-utils/
 
 .tarball-version
 .version
@@ -53,7 +55,8 @@ tests/package.m4
 tests/testsuite
 tests/testsuite.dir/
 tests/testsuite.log
-
+tests/kasumi/kasumi_test
+teste/gea/gea_test
 tests/sms/sms_test
 tests/timer/timer_test
 tests/msgfile/msgfile_test
diff --git a/include/Makefile.am b/include/Makefile.am
index b94abec..83ff9f1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -40,6 +40,8 @@ nobase_include_HEADERS = \
                        osmocom/gprs/protocol/gsm_08_16.h \
                        osmocom/gprs/protocol/gsm_08_18.h \
                        osmocom/gsm/a5.h \
+                       osmocom/gsm/gea.h \
+                       osmocom/gsm/kasumi.h \
                        osmocom/gsm/abis_nm.h \
                        osmocom/gsm/comp128.h \
                        osmocom/gsm/gan.h \
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index 59d4234..e203429 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -11,11 +11,11 @@ noinst_HEADERS = milenage/aes.h milenage/aes_i.h milenage/aes_wrap.h \
 
 lib_LTLIBRARIES = libosmogsm.la
 
-libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c gsm_utils.c \
+libosmogsm_la_SOURCES = a5.c kasumi.c rxlev_stat.c tlv_parser.c comp128.c gsm_utils.c \
                         rsl.c gsm48.c gsm48_ie.c gsm0808.c sysinfo.c \
 			gprs_cipher_core.c gsm0480.c abis_nm.c gsm0502.c \
 			gsm0411_utils.c gsm0411_smc.c gsm0411_smr.c \
-			lapd_core.c lapdm.c \
+			lapd_core.c lapdm.c gea.c \
 			auth_core.c auth_comp128v1.c auth_milenage.c \
 			milenage/aes-encblock.c milenage/aes-internal.c \
 			milenage/aes-internal-enc.c milenage/milenage.c gan.c
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index b2278f1..c5ee6f5 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -188,6 +188,13 @@ osmo_a5;
 osmo_a5_1;
 osmo_a5_2;
 
+_kasumi;
+_kasumi_key_expand;
+_kasumi_kgcore;
+
+osmo_gea3;
+osmo_gea4;
+
 osmo_auth_alg_name;
 osmo_auth_alg_parse;
 osmo_auth_gen_vec;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bc9b7de..a2de833 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,8 @@ check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test		\
                  conv/conv_test auth/milenage_test lapd/lapd_test	\
                  gsm0808/gsm0808_test gsm0408/gsm0408_test		\
 		 gb/bssgp_fc_test logging/logging_test fr/fr_test	\
-		 loggingrb/loggingrb_test strrb/strrb_test
+		 loggingrb/loggingrb_test strrb/strrb_test 		\
+		 kasumi/kasumi_test gea/gea_test
 
 if ENABLE_MSGFILE
 check_PROGRAMS += msgfile/msgfile_test
@@ -17,6 +18,12 @@ a5_a5_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/li
 auth_milenage_test_SOURCES = auth/milenage_test.c
 auth_milenage_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
 
+kasumi_kasumi_test_SOURCES = kasumi/kasumi_test.c
+kasumi_kasumi_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
+
+gea_gea_test_SOURCES = gea/gea_test.c
+gea_gea_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
+
 bits_bitrev_test_SOURCES = bits/bitrev_test.c
 bits_bitrev_test_LDADD = $(top_builddir)/src/libosmocore.la
 
@@ -91,7 +98,7 @@ EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE)		\
              msgfile/msgfile_test.ok msgfile/msgconfig.cfg		\
              logging/logging_test.ok logging/logging_test.err		\
              fr/fr_test.ok loggingrb/logging_test.ok			\
-             loggingrb/logging_test.err	strrb/strrb_test.ok
+             loggingrb/logging_test.err	strrb/strrb_test.ok kasumi/kasumi_test.ok
 
 DISTCLEANFILES = atconfig
 
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 684ec4f..5323096 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -28,6 +28,18 @@ cat $abs_srcdir/conv/conv_test.ok > expout
 AT_CHECK([$abs_top_builddir/tests/conv/conv_test], [0], [expout])
 AT_CLEANUP
 
+AT_SETUP([kasumi])
+AT_KEYWORDS([kasumi])
+cat $abs_srcdir/kasumi/kasumi_test.ok > expout
+AT_CHECK([$abs_top_builddir/tests/kasumi/kasumi_test], [0], [expout])
+AT_CLEANUP
+
+AT_SETUP([gea])
+AT_KEYWORDS([gea])
+cat $abs_srcdir/gea/gea_test.ok > expout
+AT_CHECK([$abs_top_builddir/tests/gea/gea_test], [0], [expout])
+AT_CLEANUP
+
 if ENABLE_MSGFILE
 AT_SETUP([msgfile])
 AT_KEYWORDS([msgfile])
-- 
1.7.10.4


--------------060001040407040305040404--




More information about the baseband-devel mailing list