Skip to content

U
uniset2
Commit c94ffa74 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(tests): исправил include-ы под новую версию пакета catch

parent be0b5595
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 13 deletions
extensions/LogicProcessor/unit-tests/Makefile.am
View file @ c94ffa74
...@@ -3,8 +3,7 @@ check_PROGRAMS = tests ...@@ -3,8 +3,7 @@ check_PROGRAMS = tests
tests_SOURCES = tests.cc lproc.cc tests_SOURCES = tests.cc lproc.cc
tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \ tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/extensions/LogicProcessor/libUniSet2LProcessor.la $(top_builddir)/extensions/LogicProcessor/libUniSet2LProcessor.la
tests_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/LogicProcessor \ tests_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/LogicProcessor
-I$(includedir)/Catch
$(top_builddir)/extensions/lib/libUniSet2Extensions.la: $(top_builddir)/extensions/lib/libUniSet2Extensions.la:
cd $(top_builddir)/extensions/lib/ && make cd $(top_builddir)/extensions/lib/ && make
......
extensions/LogicProcessor/unit-tests/tests.cc
View file @ c94ffa74
#define CATCH_CONFIG_MAIN #define CATCH_CONFIG_MAIN
#include <Catch/catch.hpp> #include <catch.hpp>
// не удивляйтесь, что тут нет main().. она спрятана в catch.cpp :) // не удивляйтесь, что тут нет main().. она спрятана в catch.hpp :)
extensions/tests/Makefile.am
View file @ c94ffa74
...@@ -4,16 +4,16 @@ check_PROGRAMS = tests tests_with_conf tests_with_sm ...@@ -4,16 +4,16 @@ check_PROGRAMS = tests tests_with_conf tests_with_sm
tests_SOURCES = tests.cc digitalfilter.cc tests_SOURCES = tests.cc digitalfilter.cc
tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la
tests_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include -I$(includedir)/Catch tests_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include
tests_with_conf_SOURCES = tests_with_conf.cc calibration.cc tests_with_conf_SOURCES = tests_with_conf.cc calibration.cc
tests_with_conf_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la tests_with_conf_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la
tests_with_conf_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include -I$(includedir)/Catch tests_with_conf_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include
tests_with_sm_SOURCES = tests_with_sm.cc ui.cc tests_with_sm_SOURCES = tests_with_sm.cc ui.cc
tests_with_sm_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \ tests_with_sm_LDADD = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la \
$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(SIGC_LIBS) $(COMCPP_LIBS) $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(SIGC_LIBS) $(COMCPP_LIBS)
tests_with_sm_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include -I$(includedir)/Catch \ tests_with_sm_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \
-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS) -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
......
extensions/tests/tests.cc
View file @ c94ffa74
#define CATCH_CONFIG_MAIN #define CATCH_CONFIG_MAIN
#include <Catch/catch.hpp> #include <catch.hpp>
// не удивляйтесь, что тут нет main().. она спрятана в catch.cpp :) // не удивляйтесь, что тут нет main().. она спрятана в catch.hpp :)
tests/Makefile.am
View file @ c94ffa74
...@@ -9,11 +9,11 @@ noinst_PROGRAMS = tests tests_with_conf ...@@ -9,11 +9,11 @@ noinst_PROGRAMS = tests tests_with_conf
tests_SOURCES = tests.cc passivetimer.cc hourglass.cc delaytimer.cc unixml.cc sscanf_hex.cc \ tests_SOURCES = tests.cc passivetimer.cc hourglass.cc delaytimer.cc unixml.cc sscanf_hex.cc \
callbacktimer.cc trigger.cc triggerOR.cc triggerAND.cc triggerOUT.cc pulse.cc callbacktimer.cc trigger.cc triggerOR.cc triggerAND.cc triggerOUT.cc pulse.cc
tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS) tests_LDADD = $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS)
tests_CPPFLAGS = -I$(top_builddir)/include -I$(includedir)/Catch $(SIGC_CFLAGS) $(COMCPP_CFLAGS) tests_CPPFLAGS = -I$(top_builddir)/include $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
tests_with_conf_SOURCES = tests_with_conf.cc conftest.cc ui.cc tests_with_conf_SOURCES = tests_with_conf.cc conftest.cc ui.cc
tests_with_conf_LDADD = $(top_builddir)/lib/libUniSet2.la tests_with_conf_LDADD = $(top_builddir)/lib/libUniSet2.la
tests_with_conf_CPPFLAGS = -I$(top_builddir)/include -I$(includedir)/Catch tests_with_conf_CPPFLAGS = -I$(top_builddir)/include
# umutex_SOURCES = umutex.cc # umutex_SOURCES = umutex.cc
# umutex_LDADD = $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS) # umutex_LDADD = $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
......
tests/tests.cc
View file @ c94ffa74
#define CATCH_CONFIG_MAIN #define CATCH_CONFIG_MAIN
#include <Catch/catch.hpp> #include <catch.hpp>
// не удивляйтесь, что тут нет main().. она спрятана в catch.cpp :) // не удивляйтесь, что тут нет main().. она спрятана в catch.hpp :)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment