(MBSlave): добавил запусков тестов для случая когда MBSlave

extensions/ModbusSlave/tests/Makefile.am

@@ -17,7 +17,7 @@ $(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la:
 
 include $(top_builddir)/testsuite/testsuite-common.mk
 
-check-local: atconfig package.m4 $(TESTSUITE)
+check-local: atconfig package.m4 $(TESTSUITE) mbslave-tests.at
 	$(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS)
     
 clean-local:

extensions/ModbusSlave/tests/mbslave-tests.at

-AT_SETUP([ModbusSlave tests])
+AT_SETUP([ModbusSlave tests (with SM)])
 AT_CHECK([$abs_top_builddir/testsuite/at-test-launch.sh $abs_top_builddir/extensions/ModbusSlave/tests tests_with_sm.sh],[0],[ignore],[ignore])
 AT_CLEANUP
+
+AT_SETUP([ModbusSlave tests (Apart)])
+AT_CHECK([$abs_top_builddir/testsuite/at-test-launch.sh $abs_top_builddir/extensions/ModbusSlave/tests tests_with_sm_apart.sh],[0],[ignore],[ignore])
+AT_CLEANUP

extensions/ModbusSlave/tests/tests_with_sm.cc

@@ -34,11 +34,13 @@ int main(int argc, char* argv[] )
 		uniset_init(argc,argv);
         conf->initDebug(dlog,"dlog");
         
+        bool apart = findArgParam("--apart",argc,argv) != -1;
+        
         SharedMemory* shm = SharedMemory::init_smemory(argc, argv);
         if( !shm )
             return 1;
 
-        MBSlave* mbs = MBSlave::init_mbslave(argc,argv,shm->getId(),shm);
+        MBSlave* mbs = MBSlave::init_mbslave(argc,argv,shm->getId(), (apart ? nullptr : shm ));
         if( !mbs )
             return 1;
 

extensions/ModbusSlave/tests/tests_with_sm_apart.sh

+#!/bin/sh
+
+# '--' - нужен для отделения аргументов catch, от наших..
+cd ../../../Utilities/Admin/
+./uniset2-start.sh -f ./create_links.sh
+./uniset2-start.sh -f ./create
+
+./uniset2-start.sh -f ./exist | grep -q UNISET_PLC/Controllers || exit 1
+cd -
+
+./uniset2-start.sh -f ./tests-with-sm $* -- --apart --confile mbslave-test-configure.xml --e-startup-pause 10 \
+--mbs-name MBSlave1 --mbs-type TCP --mbs-inet-addr 127.0.0.1 --mbs-inet-port 20048 --mbs-my-addr 0x01 \
+--mbs-askcount-id SVU_AskCount_AS --mbs-respond-id RespondRTU_S --mbs-respond-invert 1 \
+--mbs-filter-field mbs --mbs-filter-value 1