(test): перевёл запуск тестов на (autools)"make check"

Utilities/scripts/catch-test-run.sh

+#!/bin/sh
+
+exec $1 ${CATCH_TEST_ARGS} -o $1.test.log  1>/dev/null 2>/dev/null

configure.ac

@@ -12,6 +12,15 @@ AC_CONFIG_HEADER(uniset-config.h)
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
 
+
+dnl Initialize test suite
+#CATCH_TEST_ARGS="-s"
+CATCH_TEST_ARGS=
+AC_SUBST(CATCH_TEST_ARGS)
+
+TESTS_ENVIRONMENT="CATCH_TEST_ARGS=\"${CATCH_TEST_ARGS}\" \$(top_builddir)/Utilities/scripts/catch-test-run.sh"
+AC_SUBST(TESTS_ENVIRONMENT)
+
 dnl Checks for programs.
 AC_PROG_INSTALL
 AC_PROG_CC

extensions/Makefile.am

@@ -16,5 +16,3 @@ pkgconfig_DATA 	= libUniSet2Extensions.pc
 else
 SUBDIRS =
 endif
-
-

extensions/lib/Calibration.cc

@@ -5,6 +5,7 @@
 #include "UniXML.h"
 #include "Exceptions.h"
 #include "Calibration.h"
+#include "Extensions.h"
 // ----------------------------------------------------------------------------
 using namespace std;
 using namespace UniSetTypes;
@@ -188,7 +189,7 @@ void Calibration::build( const string& name, const string& confile, xmlNode* roo
 
             if( p.x==0 || p.y==0 )
             {
-                cerr << myname << "(Calibration::build): (warn) x="
+                dwarn << myname << "(Calibration::build): (warn) x="
                         << p.x << " y=" << p.y << endl;
             }
 
@@ -233,7 +234,7 @@ void Calibration::build( const string& name, const string& confile, xmlNode* roo
     }
     catch( Exception& ex )
     {
-        cerr << myname << "(Calibration::build): Failed open " << confile << endl;
+        dcrit << myname << "(Calibration::build): Failed open " << confile << endl;
         throw;
     }
 }

extensions/tests/Makefile.am

 SUBDIR=SMemoryTest
 
-noinst_PROGRAMS = tests tests_with_conf tests_with_sm
+#noinst_PROGRAMS = tests tests_with_conf tests_with_sm
+
+check_PROGRAMS = tests tests_with_conf tests_with_sm
+TESTS=tests tests_with_conf.sh tests_with_sm.sh
 
 tests_SOURCES   = tests.cc digitalfilter.cc
 tests_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la
@@ -16,3 +19,5 @@ tests_with_sm_LDADD     = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/exte
 tests_with_sm_CPPFLAGS  = -I$(top_builddir)/include -I$(top_builddir)/extensions/include -I$(includedir)/Catch \
 	-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)  $(COMCPP_CFLAGS)
 
+clean-local:	
+	rm -rf *.log

tests/Makefile.am

@@ -2,8 +2,13 @@
 # This file is part of the UniSet library                                  #
 ############################################################################
 
-noinst_PROGRAMS 		= tests tests_with_conf
-#ui umutex sscanf_hexthreadtst dlog
+check_PROGRAMS = tests tests_with_conf
+
+#TESTS_ENVIRONMENT = CATCH_TEST_ARGS="$(CATCH_TEST_ARGS)" ./test-run.sh
+TESTS = tests tests_with_conf.sh
+EXTRA_DIR=$(TESTS)
+
+#umutex sscanf_hexthreadtst dlog
 
 tests_SOURCES = tests.cc passivetimer.cc hourglass.cc delaytimer.cc unixml.cc
 tests_LDADD 	= $(top_builddir)/lib/libUniSet2.la
@@ -31,3 +36,9 @@ tests_with_conf_CPPFLAGS = -I$(top_builddir)/include -I$(includedir)/Catch
 # dlog_LDADD 	= $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS} $(COMCPP_LIBS)
 # dlog_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
 # 
+
+testdir=$(top_builddir)/tests
+
+#check-local: tests tests_with_conf
+#	$(SHELL) $(testdir)/tests 2>/dev/null
+#	$(SHELL) $(testdir)/tests_with_conf -- --confile $(testdir)/tests_with_conf.xml --prop-id2 -10 --ulog-no-debug 2>/dev/null

tests/tests_with_conf.sh

 #!/bin/sh
 
 # '--' - нужен для отделения аоргументов catch, от наших..
-uniset-start.sh -f ./tests_with_conf $* -- --confile tests_with_conf.xml --prop-id2 -10
+./tests_with_conf $* -- --confile tests_with_conf.xml --prop-id2 -10 --ulog-no-debug

tests/uitest.sh

-#!/bin/sh
-
-SID=$1
-
-[ -z "$SID" ] && SID=1
-
-uniset-start.sh -f ./ui --confile test.xml --sid $SID --ulog-add-levels any
-# -ORBtraceLevel 20
-