tsrc/unittestrunner/eunittest_ctc.pl
branchRCL_3
changeset 22 73a1feb507fb
parent 0 f0cf47e981f9
child 23 bc78a40cd63c
--- a/tsrc/unittestrunner/eunittest_ctc.pl	Thu Aug 19 09:51:39 2010 +0300
+++ b/tsrc/unittestrunner/eunittest_ctc.pl	Tue Aug 31 15:12:07 2010 +0300
@@ -42,9 +42,10 @@
 $ignoredmodeSourceRelative = "1";
 
 $coverageSymbols = "MON.sym";
-$ctcCommandPart1 = "ctcwrap -i d -n";
-$ctcCommandPart2 = "abld build winscw udeb";
-$ctcCommandPart2Test = "abld test build winscw udeb";
+#$ctcCommandPart1 = "ctcwrap -i d -2comp -no-conf-check -n";
+$ctcCommandPart1 = "ctcwrap -i d -2comp -n";
+$ctcCommandPart2 = "sbs.bat -c winscw_udeb";
+$ctcCommandPart2Test = "sbs -c winscw_udeb.test";
 $ctcIgnoredPart1 = " -C \"EXCLUDE+";
 $ctcIgnoredPart2 = "\" ";
 
@@ -239,11 +240,12 @@
 		    	unlink("$eunitDstDllLocation$currentDllNameLine");
 		    	if ($currentBuildModeLine =~ /$eunitTestBuildMode/)
 					{
-						doSystemCall("abld test reallyclean winscw udeb ");
+						doSystemCall("sbs -c winscw_udeb.test reallyclean ");
 		    	}
 		    	else
 		    	{
-		    		doSystemCall("abld reallyclean winscw udeb ");
+		    		#doSystemCall("sbs -c winscw_udeb reallyclean ");
+		    		doSystemCall("sbs REALLYCLEAN ");
 		    	}
 	    	}
 	    	else
@@ -267,16 +269,15 @@
 				else
 				{
 					print("previous dll was not from same path - build all!\n");
-					doSystemCall("bldmake bldfiles");
 					
 					if ($currentBuildModeLine =~ /$eunitTestBuildMode/)
-					{
-						doSystemCall("abld test reallyclean winscw udeb ");
-		    		doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2Test");
-		    	}
+				    {
+                        doSystemCall("sbs -c winscw_udeb.test reallyclean ");
+                        doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2Test");
+		    	    }
 		    	else
 		    	{
-		    		doSystemCall("abld reallyclean winscw udeb ");
+		    		doSystemCall("sbs REALLYCLEAN ");
 		    		doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2");
 		    	}
 				}