(tests): вынес запуск тестов в один каталог (testsuite)

Makefile.am

@@ -3,7 +3,7 @@
 ############################################################################
 
 FIRSTSUBDIRS=IDL
-SUBDIRS=. src lib include Utilities tests extensions python docs
+SUBDIRS=. src lib include Utilities tests extensions python testsuite docs
 
 pkgconfigdir 	= $(libdir)/pkgconfig
 pkgconfig_DATA 	= libUniSet2.pc

configure.ac

@@ -13,14 +13,7 @@ dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
 
 dnl Initialize test suite
-AC_CONFIG_TESTDIR(tests)
-
-#CATCH_TEST_ARGS="-s"
-CATCH_TEST_ARGS=
-AC_SUBST(CATCH_TEST_ARGS)
-
-CATCH_TESTS_ENVIRONMENT="CATCH_TEST_ARGS=\"$(CATCH_TEST_ARGS)\" \$(top_builddir)/Utilities/scripts/catch-test-run.sh"
-AC_SUBST(CATCH_TESTS_ENVIRONMENT)
+AC_CONFIG_TESTDIR(testsuite)
 
 dnl Checks for programs.
 AC_PROG_INSTALL
@@ -33,7 +26,6 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
-
 dnl Initialize libtool
 AC_DISABLE_STATIC
 AC_ENABLE_SHARED(yes)
@@ -302,6 +294,7 @@ AC_CONFIG_FILES([Makefile
 				 extensions/RRDServer/libUniSet2RRDServer.pc
 				 extensions/tests/Makefile
 				 extensions/tests/SMemoryTest/Makefile
+				 testsuite/Makefile
 				 python/lib/Makefile
 				 python/lib/pyUniSet/Makefile
 				 python/Makefile])

tests/Makefile.am

@@ -5,7 +5,6 @@
 check_PROGRAMS = tests tests_with_conf
 
 #umutex sscanf_hexthreadtst dlog
-
 tests_SOURCES = tests.cc passivetimer.cc hourglass.cc delaytimer.cc unixml.cc
 tests_LDADD 	= $(top_builddir)/lib/libUniSet2.la
 tests_CPPFLAGS	= -I$(top_builddir)/include -I$(includedir)/Catch
@@ -38,31 +37,3 @@ tests_with_conf_CPPFLAGS = -I$(top_builddir)/include -I$(includedir)/Catch
 #	$(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_ENVIRONMENT=$(CATCH_TESTS_ENVIRONMENT)
-TESTS=tests tests_with_conf.sh
-
-TESTSUITE_AT=testsuite.at
-TESTSUITE=testsuite
-
-EXTRA_DIR=package.m4 $(TESTS) $(TESTSUITE) $(TESTSUITE_AT)
-
-testsuite: package.m4 $(TESTS) $(TESTSUITE_AT)
-	autom4te -l autotest $(TESTSUITE_AT) -o $@
-
-clean-local:
-	rm -rf *.log
-
-check-local: atconfig $(TESTSUITE) $(TESTS)
-	$(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS)
-
-package.m4: Makefile
-	:;{ \
-	  echo '# Signature of the current package.' && \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])' && \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])' && \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [$(PACKAGE_VERSION)])' && \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])' && \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \
-	  echo 'm4_define([AT_PACKAGE_URL],       [$(PACKAGE_URL)])'; \
-	} > $@-t
-	mv $@-t $@

tests/testsuite.at

-m4_include(package.m4)
-
-AT_COLOR_TESTS
-   
-AT_INIT([Uniset test suite])
-
-AT_SETUP([Basic tests])
-AT_CHECK([at-test-launch.sh $abs_top_builddir/$AUTOTEST_PATH tests 77],[0],[ignore],[ignore])
-AT_CLEANUP
-
-AT_SETUP([Tests with conf])
-AT_CHECK([at-test-launch.sh $abs_top_builddir/$AUTOTEST_PATH tests_with_conf.sh],[0],[ignore],[ignore])
-AT_CLEANUP

testsuite/Makefile.am

+
+#TESTS=$(top_builddir)/tests/tests $(top_builddir)/tests/tests_with_conf.sh
+
+TESTSUITE_AT=testsuite.at
+TESTSUITE=testsuite
+
+EXTRA_DIR=package.m4 $(TESTS) $(TESTSUITE) $(TESTSUITE_AT)
+
+testsuite: atconfig package.m4 $(TESTS) $(TESTSUITE_AT)
+	autom4te -l autotest $(TESTSUITE_AT) -o $@
+
+clean-local:
+	rm -rf *.log atconfig package.m4 $(TESTSUITE)
+
+check-local: atconfig package.m4 $(TESTSUITE) $(TESTS)
+	$(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS)
+
+package.m4: Makefile
+	:;{ \
+	  echo '# Signature of the current package.' && \
+	  echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])' && \
+	  echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])' && \
+	  echo 'm4_define([AT_PACKAGE_VERSION],   [$(PACKAGE_VERSION)])' && \
+	  echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])' && \
+	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \
+	  echo 'm4_define([AT_PACKAGE_URL],       [$(PACKAGE_URL)])'; \
+	} > $@-t
+	mv $@-t $@
+
+atconfig: $(top_builddir)/config.status
+	cd $(top_builddir) && ./config.status testsuite/$@
\ No newline at end of file

tests/at-test-launch.sh → testsuite/at-test-launch.sh

@@ -2,6 +2,9 @@
 
 [ -n "$3" ] && exit $3
 
+echo "$1 run $2" > e.t
+
 cd $1
-exec $2
+exec ./$2
 exit 1
+                                           
\ No newline at end of file

testsuite/basic-tests.at

+AT_SETUP([Basic tests])
+AT_CHECK([at-test-launch.sh $abs_top_builddir/tests tests],[0],[ignore],[ignore])
+AT_CLEANUP
+
+AT_SETUP([Tests with conf])
+AT_CHECK([at-test-launch.sh $abs_top_builddir/tests tests_with_conf.sh],[0],[ignore],[ignore])
+AT_CLEANUP

testsuite/testsuite.at

+m4_include(package.m4)
+
+AT_COLOR_TESTS
+
+AT_INIT([Uniset test suite])
+   
+m4_include(basic-tests.at)