fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29408 ) Change subject: tests: reorganize llc/rlcmac specific dirs and files ...................................................................... tests: reorganize llc/rlcmac specific dirs and files Change-Id: I8592cea020dbbf64940266cd6af14b14d34be3a6 --- M configure.ac M tests/Makefile.am R tests/llc/Makefile.am R tests/llc/pdu_codec_test.c R tests/llc/pdu_codec_test.err R tests/llc/pdu_codec_test.ok R tests/rlcmac/Makefile.am R tests/rlcmac/ts_44_018_test.c R tests/rlcmac/ts_44_018_test.err R tests/rlcmac/ts_44_018_test.ok R tests/rlcmac/ts_44_060_test.c R tests/rlcmac/ts_44_060_test.err R tests/rlcmac/ts_44_060_test.ok M tests/testsuite.at D tests/ts_44_060/Makefile.am 15 files changed, 24 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index b9b2d81..84824fc 100644 --- a/configure.ac +++ b/configure.ac @@ -86,9 +86,8 @@ 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 diff --git a/tests/Makefile.am b/tests/Makefile.am index 15660c9..98ffe09 100644 --- a/tests/Makefile.am +++ b/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. diff --git a/tests/llc_pdu_codec/Makefile.am b/tests/llc/Makefile.am similarity index 100% rename from tests/llc_pdu_codec/Makefile.am rename to tests/llc/Makefile.am diff --git a/tests/llc_pdu_codec/pdu_codec_test.c b/tests/llc/pdu_codec_test.c similarity index 100% rename from tests/llc_pdu_codec/pdu_codec_test.c rename to tests/llc/pdu_codec_test.c diff --git a/tests/llc_pdu_codec/pdu_codec_test.err b/tests/llc/pdu_codec_test.err similarity index 100% rename from tests/llc_pdu_codec/pdu_codec_test.err rename to tests/llc/pdu_codec_test.err diff --git a/tests/llc_pdu_codec/pdu_codec_test.ok b/tests/llc/pdu_codec_test.ok similarity index 100% rename from tests/llc_pdu_codec/pdu_codec_test.ok rename to tests/llc/pdu_codec_test.ok diff --git a/tests/ts_44_018/Makefile.am b/tests/rlcmac/Makefile.am similarity index 67% rename from tests/ts_44_018/Makefile.am rename to tests/rlcmac/Makefile.am index 13c0afa..b840b1f 100644 --- a/tests/ts_44_018/Makefile.am +++ b/tests/rlcmac/Makefile.am @@ -10,16 +10,25 @@ 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) diff --git a/tests/ts_44_018/ts_44_018_test.c b/tests/rlcmac/ts_44_018_test.c similarity index 100% rename from tests/ts_44_018/ts_44_018_test.c rename to tests/rlcmac/ts_44_018_test.c diff --git a/tests/ts_44_018/ts_44_018_test.err b/tests/rlcmac/ts_44_018_test.err similarity index 100% rename from tests/ts_44_018/ts_44_018_test.err rename to tests/rlcmac/ts_44_018_test.err diff --git a/tests/ts_44_018/ts_44_018_test.ok b/tests/rlcmac/ts_44_018_test.ok similarity index 100% rename from tests/ts_44_018/ts_44_018_test.ok rename to tests/rlcmac/ts_44_018_test.ok diff --git a/tests/ts_44_060/ts_44_060_test.c b/tests/rlcmac/ts_44_060_test.c similarity index 100% rename from tests/ts_44_060/ts_44_060_test.c rename to tests/rlcmac/ts_44_060_test.c diff --git a/tests/ts_44_060/ts_44_060_test.err b/tests/rlcmac/ts_44_060_test.err similarity index 100% rename from tests/ts_44_060/ts_44_060_test.err rename to tests/rlcmac/ts_44_060_test.err diff --git a/tests/ts_44_060/ts_44_060_test.ok b/tests/rlcmac/ts_44_060_test.ok similarity index 100% rename from tests/ts_44_060/ts_44_060_test.ok rename to tests/rlcmac/ts_44_060_test.ok diff --git a/tests/testsuite.at b/tests/testsuite.at index 703fd7a..de69bf4 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -3,21 +3,21 @@ 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 diff --git a/tests/ts_44_060/Makefile.am b/tests/ts_44_060/Makefile.am deleted file mode 100644 index fb953e3..0000000 --- a/tests/ts_44_060/Makefile.am +++ /dev/null @@ -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) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8592cea020dbbf64940266cd6af14b14d34be3a6 Gerrit-Change-Number: 29408 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged