(tests): Добавил для тестов префикс test_

extensions/tests/Makefile.am

@@ -3,15 +3,15 @@ SUBDIR=SMemoryTest
 if  HAVE_TESTS
 noinst_PROGRAMS = tests tests_with_conf tests_with_sm
 
-tests_SOURCES   = tests.cc digitalfilter.cc vtypes.cc
+tests_SOURCES   = tests.cc test_digitalfilter.cc test_vtypes.cc
 tests_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la
 tests_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include
 
-tests_with_conf_SOURCES   = tests_with_conf.cc  calibration.cc iobase.cc
+tests_with_conf_SOURCES   = tests_with_conf.cc test_calibration.cc test_iobase.cc
 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
 
-tests_with_sm_SOURCES   = tests_with_sm.cc ui.cc
+tests_with_sm_SOURCES   = tests_with_sm.cc test_ui.cc
 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)
 tests_with_sm_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include \

extensions/tests/iobase.cc → extensions/tests/test_iobase.cc

@@ -9,7 +9,7 @@ using namespace std;
 using namespace UniSetTypes;
 using namespace UniSetExtensions;
 
-TEST_CASE("IOBase","[IOBase class tests]")
+TEST_CASE("IOBase","[iobase][extensions]")
 {
     CHECK( uniset_conf()!=nullptr );
 
@@ -202,7 +202,7 @@ TEST_CASE("IOBase","[IOBase class tests]")
         CHECK_FALSE( ib.check_front(false) );
     }
 
-    SECTION("Front 'unkown' (off)")
+    SECTION("Front 'unknown' (off)")
     {
         IOBase ib;
         CHECK( ib.check_front(true) );

tests/Makefile.am

@@ -7,15 +7,30 @@ if HAVE_TESTS
 noinst_PROGRAMS = tests tests_with_conf
 
 #umutex threadtst dlog
-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 \
-	modbustypes.cc utypes.cc 
 tests_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS)
 tests_CPPFLAGS	= -I$(top_builddir)/include $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+tests_SOURCES = tests.cc \
+test_passivetimer.cc \
+test_hourglass.cc \
+test_delaytimer.cc \
+test_unixml.cc \
+test_sscanf_hex.cc \
+test_callbacktimer.cc \
+test_trigger.cc \
+test_triggerOR.cc \
+test_triggerAND.cc \
+test_triggerOUT.cc \
+test_pulse.cc \
+test_modbustypes.cc \
+test_utypes.cc 
 
-tests_with_conf_SOURCES = tests_with_conf.cc conftest.cc ui.cc iorfile.cc messagetype.cc 
 tests_with_conf_LDADD   = $(top_builddir)/lib/libUniSet2.la
 tests_with_conf_CPPFLAGS = -I$(top_builddir)/include
+tests_with_conf_SOURCES = tests_with_conf.cc \
+test_conftest.cc \
+test_ui.cc \
+test_iorfile.cc \
+test_messagetype.cc 
      
 # umutex_SOURCES 	= umutex.cc
 # umutex_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)