[libosmo-sccp PATCH 5/7] build: simplify test build

This makes the tests handling similar to the new one on libosmocore. Please note that mtp/mtp_parse_test does not have to be declared explicitly since it requires no library to be linked and the source filename matches the target's name. Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu> --- .gitignore | 1 + configure.ac | 3 -- tests/Makefile.am | 54 +++++++++++++++++++++++++++++------------------ tests/m2ua/Makefile.am | 8 ------- tests/mtp/Makefile.am | 6 ----- tests/sccp/Makefile.am | 10 -------- 6 files changed, 34 insertions(+), 48 deletions(-) delete mode 100644 tests/m2ua/Makefile.am delete mode 100644 tests/mtp/Makefile.am delete mode 100644 tests/sccp/Makefile.am diff --git a/.gitignore b/.gitignore index 65fb1ef..7cd3da2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.o *.a .deps +.dirstamp Makefile Makefile.in bscconfig.h diff --git a/configure.ac b/configure.ac index 4de05f2..9fb5f5b 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,5 @@ AC_OUTPUT( include/Makefile src/Makefile tests/Makefile - tests/sccp/Makefile - tests/mtp/Makefile - tests/m2ua/Makefile Makefile) diff --git a/tests/Makefile.am b/tests/Makefile.am index d005e7b..276d306 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,40 +1,52 @@ -SUBDIRS = sccp mtp m2ua +INCLUDES = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac :;{ \ - echo '# Signature of the current package.' && \ - echo 'm4_define([AT_PACKAGE_NAME],' && \ - echo ' [$(PACKAGE_NAME)])' && \ - echo 'm4_define([AT_PACKAGE_TARNAME],' && \ - echo ' [$(PACKAGE_TARNAME)])' && \ - echo 'm4_define([AT_PACKAGE_VERSION],' && \ - echo ' [$(PACKAGE_VERSION)])' && \ - echo 'm4_define([AT_PACKAGE_STRING],' && \ - echo ' [$(PACKAGE_STRING)])' && \ - echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ - echo ' [$(PACKAGE_BUGREPORT)])'; \ - echo 'm4_define([AT_PACKAGE_URL],' && \ - echo ' [$(PACKAGE_URL)])'; \ - } >'$(srcdir)/package.m4' - -EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) + echo '# Signature of the current package.' && \ + echo 'm4_define([AT_PACKAGE_NAME],' && \ + echo ' [$(PACKAGE_NAME)])' && \ + echo 'm4_define([AT_PACKAGE_TARNAME],' && \ + echo ' [$(PACKAGE_TARNAME)])' && \ + echo 'm4_define([AT_PACKAGE_VERSION],' && \ + echo ' [$(PACKAGE_VERSION)])' && \ + echo 'm4_define([AT_PACKAGE_STRING],' && \ + echo ' [$(PACKAGE_STRING)])' && \ + echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ + echo ' [$(PACKAGE_BUGREPORT)])'; \ + echo 'm4_define([AT_PACKAGE_URL],' && \ + echo ' [$(PACKAGE_URL)])'; \ + } >'$(srcdir)/package.m4' + +EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \ + m2ua/m2ua_test.ok mtp/mtp_parse_test.ok \ + sccp/sccp_test.ok + TESTSUITE = $(srcdir)/testsuite - + check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) - + installcheck-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ $(TESTSUITEFLAGS) - + clean-local: test ! -f '$(TESTSUITE)' || \ $(SHELL) '$(TESTSUITE)' --clean $(RM) -f atconfig - + AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at mv $@.tmp $@ + +check_PROGRAMS = m2ua/m2ua_test mtp/mtp_parse_test sccp/sccp_test + +m2ua_m2ua_test_SOURCES = m2ua/m2ua_test.c +m2ua_m2ua_test_LDADD = $(top_builddir)/src/libm2ua.a $(LIBOSMOCORE_LIBS) + +sccp_sccp_test_SOURCES = sccp/sccp_test.c $(top_srcdir)/src/sccp.c +sccp_sccp_test_LDADD = $(LIBOSMOCORE_LIBS) diff --git a/tests/m2ua/Makefile.am b/tests/m2ua/Makefile.am deleted file mode 100644 index 0eb8302..0000000 --- a/tests/m2ua/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -Wall -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) - -EXTRA_DIST = m2ua_test.ok - -noinst_PROGRAMS = m2ua_test -m2ua_test_SOURCES = m2ua_test.c -m2ua_test_LDADD = $(top_builddir)/src/libm2ua.a $(LIBOSMOCORE_LIBS) diff --git a/tests/mtp/Makefile.am b/tests/mtp/Makefile.am deleted file mode 100644 index 9e9292c..0000000 --- a/tests/mtp/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -Wall -noinst_PROGRAMS = mtp_parse_test - -EXTRA_DIST = mtp_parse_test.ok - -mtp_parse_test_SOURCES = mtp_parse_test.c diff --git a/tests/sccp/Makefile.am b/tests/sccp/Makefile.am deleted file mode 100644 index 90790a3..0000000 --- a/tests/sccp/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) - -EXTRA_DIST = sccp_test.ok - -noinst_PROGRAMS = sccp_test - -sccp_test_SOURCES = sccp_test.c $(top_srcdir)/src/sccp.c -sccp_test_LDADD = $(LIBOSMOCORE_LIBS) - -- 1.7.8.6