From e190b9465cfd43078c1c5a13a9fc86f1b98e2aca Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 16 Oct 2016 12:42:00 +0200 Subject: [PATCH] test contrib as well --- .travis.yml | 1 + Makefile.am | 3 +++ src/lib/ebus/contrib/test/Makefile.am | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ba71f27..89208517 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ before_install: script: - ./autogen.sh --enable-coverage && make all test - (cd src/lib/ebus/test && ./test_symbol && ./test_filereader && ./test_data && ./test_message) + - (cd src/lib/ebus/contrib/test && ./test_contrib) - ./src/ebusd/ebusd --help - ./test_coverage.sh after_success: diff --git a/Makefile.am b/Makefile.am index f8da0baa..fdbc505f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,6 +11,9 @@ EXTRA_DIST = LICENSE \ test: $(MAKE) -C src/lib/ebus/test +if CONTRIB + $(MAKE) -C src/lib/ebus/contrib/test +endif distclean-local: -rm -rf autom4te.cache diff --git a/src/lib/ebus/contrib/test/Makefile.am b/src/lib/ebus/contrib/test/Makefile.am index 1af3b756..0c050f05 100644 --- a/src/lib/ebus/contrib/test/Makefile.am +++ b/src/lib/ebus/contrib/test/Makefile.am @@ -1,10 +1,10 @@ AM_CXXFLAGS = -Wno-unused-parameter \ -isystem$(top_srcdir)/src/lib/ebus -isystem../ -noinst_PROGRAMS = test_tem +noinst_PROGRAMS = test_contrib -test_tem_SOURCES = test_tem.cpp -test_tem_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a +test_contrib_SOURCES = test_tem.cpp +test_contrib_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a distclean-local: -rm -f Makefile.in