tests: reorganize llc/rlcmac specific dirs and files

Change-Id: I8592cea020dbbf64940266cd6af14b14d34be3a6

configure.ac

@@ -86,9 +86,8 @@ AC_CONFIG_FILES([libosmo-csn1.pc
 		 src/llc/Makefile
 		 src/rlcmac/Makefile
 		 tests/Makefile
-		 tests/llc_pdu_codec/Makefile
-		 tests/ts_44_018/Makefile
-		 tests/ts_44_060/Makefile
+		 tests/llc/Makefile
+		 tests/rlcmac/Makefile
 		 Makefile
 		 contrib/libosmo-gprs.spec])
 AC_OUTPUT

tests/Makefile.am

@@ -1,7 +1,6 @@
 SUBDIRS = \
-	llc_pdu_codec \
-	ts_44_018 \
-	ts_44_060 \
+	llc \
+	rlcmac \
 	$(NULL)
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.

tests/rlcmac/Makefile.am

@@ -10,16 +10,25 @@ AM_LDFLAGS = \
 
 check_PROGRAMS = \
 	ts_44_018_test \
+	ts_44_060_test \
 	$(NULL)
 
 EXTRA_DIST = \
 	ts_44_018_test.ok \
 	ts_44_018_test.err \
+	ts_44_060_test.ok \
+	ts_44_060_test.err \
 	$(NULL)
 
-ts_44_018_test_SOURCES = ts_44_018_test.c
-ts_44_018_test_LDADD = \
+# Common LDADD entries
+LDADD = \
 	$(LIBOSMOCORE_LIBS) \
 	$(top_builddir)/src/csn1/libosmo-csn1.la \
 	$(top_builddir)/src/rlcmac/libosmo-gprs-rlcmac.la \
 	$(NULL)
+
+ts_44_018_test_SOURCES = ts_44_018_test.c
+ts_44_018_test_LDADD = $(LDADD)
+
+ts_44_060_test_SOURCES = ts_44_060_test.c
+ts_44_060_test_LDADD = $(LDADD)

tests/testsuite.at

@@ -3,21 +3,21 @@ AT_BANNER([Regression tests])
 
 AT_SETUP([llc/pdu_codec])
 AT_KEYWORDS([llc pdu codec])
-cat $abs_srcdir/llc_pdu_codec/pdu_codec_test.ok > expout
-cat $abs_srcdir/llc_pdu_codec/pdu_codec_test.err > experr
-AT_CHECK([$abs_top_builddir/tests/llc_pdu_codec/pdu_codec_test], [0], [expout], [experr])
+cat $abs_srcdir/llc/pdu_codec_test.ok > expout
+cat $abs_srcdir/llc/pdu_codec_test.err > experr
+AT_CHECK([$abs_top_builddir/tests/llc/pdu_codec_test], [0], [expout], [experr])
 AT_CLEANUP
 
 AT_SETUP([rlcmac/ts_44_018])
 AT_KEYWORDS([rlcmac ts_44_018])
-cat $abs_srcdir/ts_44_018/ts_44_018_test.ok > expout
-cat $abs_srcdir/ts_44_018/ts_44_018_test.err > experr
-AT_CHECK([$abs_top_builddir/tests/ts_44_018/ts_44_018_test], [0], [expout], [experr])
+cat $abs_srcdir/rlcmac/ts_44_018_test.ok > expout
+cat $abs_srcdir/rlcmac/ts_44_018_test.err > experr
+AT_CHECK([$abs_top_builddir/tests/rlcmac/ts_44_018_test], [0], [expout], [experr])
 AT_CLEANUP
 
 AT_SETUP([rlcmac/ts_44_060])
 AT_KEYWORDS([rlcmac ts_44_060])
-cat $abs_srcdir/ts_44_060/ts_44_060_test.ok > expout
-cat $abs_srcdir/ts_44_060/ts_44_060_test.err > experr
-AT_CHECK([$abs_top_builddir/tests/ts_44_060/ts_44_060_test], [0], [expout], [experr])
+cat $abs_srcdir/rlcmac/ts_44_060_test.ok > expout
+cat $abs_srcdir/rlcmac/ts_44_060_test.err > experr
+AT_CHECK([$abs_top_builddir/tests/rlcmac/ts_44_060_test], [0], [expout], [experr])
 AT_CLEANUP

tests/ts_44_060/Makefile.am

@@ -1,25 +0,0 @@
-AM_CFLAGS = \
-	-Wall \
-	$(LIBOSMOCORE_CFLAGS) \
-	-I$(top_srcdir)/include/ \
-	$(NULL)
-
-AM_LDFLAGS = \
-	-no-install \
-	$(NULL)
-
-check_PROGRAMS = \
-	ts_44_060_test \
-	$(NULL)
-
-EXTRA_DIST = \
-	ts_44_060_test.ok \
-	ts_44_060_test.err \
-	$(NULL)
-
-ts_44_060_test_SOURCES = ts_44_060_test.c
-ts_44_060_test_LDADD = \
-	$(LIBOSMOCORE_LIBS) \
-	$(top_builddir)/src/csn1/libosmo-csn1.la \
-	$(top_builddir)/src/rlcmac/libosmo-gprs-rlcmac.la \
-	$(NULL)