(codegen): переписал функцию waitSM().

Utilities/codegen/ctl-cpp-common.xsl

@@ -532,7 +532,8 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
 			&lt;&lt; wait_msec &lt;&lt; " msec"
 			&lt;&lt; " testID=" &lt;&lt; _testID &lt;&lt; endl;
 		
-	if( !ui->waitWorking(_testID,wait_msec) )
+	// waitReady можно использовать т.к. датчик это по сути IONotifyController
+	if( !ui-&gt;waitReady(_testID,wait_msec) )
 	{
 		ostringstream err;
 		err &lt;&lt; myname 
@@ -547,24 +548,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
 //		throw SystemError(err.str());
 	}
 
-<xsl:if test="normalize-space($TESTMODE)!=''">
-	if( idTestMode_S != DefaultObjectId )
+	if( !ui->waitWorking(_testID,wait_msec) )
 	{
-		if( !ui->waitWorking(idTestMode_S,wait_msec) )
-		{
-			ostringstream err;
-			err &lt;&lt; myname 
-				&lt;&lt; "(waitSM): Не дождались готовности(work) SharedMemory к работе в течение " 
-				&lt;&lt; wait_msec &lt;&lt; " мсек";
+		ostringstream err;
+		err &lt;&lt; myname
+			&lt;&lt; "(waitSM): Не дождались готовности(work) SharedMemory к работе в течение "
+			&lt;&lt; wait_msec &lt;&lt; " мсек";
 	
-            mycrit &lt;&lt; err.str() &lt;&lt; endl;
-//			terminate();
-//			abort();
-			raise(SIGTERM);
-//			throw SystemError(err.str());
-		}
+		mycrit &lt;&lt; err.str() &lt;&lt; endl;
+//		terminate();
+//		abort();
+		raise(SIGTERM);
+//		throw SystemError(err.str());
 	}
-</xsl:if>
 }
 // ----------------------------------------------------------------------------
 std::string <xsl:value-of select="$CLASSNAME"/>_SK::help()

Utilities/codegen/tests/Makefile.am

@@ -13,6 +13,8 @@ GENERATED=TestGen_SK.h TestGen_SK.cc TestGen-main.cc
 GENERATED2=TestGenAlone_SK.h TestGenAlone_SK.cc TestGenAlone-main.cc
 GENUOBJ=UObject_SK.cc UObject_SK.h
 
+BUILT_SOURCES=$(GENERATED) $(GENERATED2) $(GENOBJ)
+
 TestGen-main.cc TestGen_SK.cc TestGen_SK.h: ../@PACKAGE@-codegen testgen.src.xml ../*.xsl
 	../@PACKAGE@-codegen -l $(top_builddir)/Utilities/codegen --gen-varmap --local-include -n TestGen testgen.src.xml
 

Utilities/codegen/tests/start_fg.sh

@@ -3,7 +3,7 @@
 ulimit -Sc 1000000
 
 uniset2-start.sh -f ./test --name TestProc --confile test.xml --ulog-add-levels warn,crit \
---sm-ready-timeout 5000 --test-run-logserver --test-log-add-levels any
+--test-sm-ready-timeout 15000 --test-run-logserver --test-log-add-levels any $*
 
 #info,warn,crit,system,level9 > 1.log
 #--c-filter-field cfilter --c-filter-value test1 --s-filter-field io --s-filter-value 1