diff -r 73a1feb507fb -r bc78a40cd63c tsrc/unittestrunner/eunittest_ctc.pl --- a/tsrc/unittestrunner/eunittest_ctc.pl Tue Aug 31 15:12:07 2010 +0300 +++ b/tsrc/unittestrunner/eunittest_ctc.pl Wed Sep 01 12:31:01 2010 +0100 @@ -42,10 +42,9 @@ $ignoredmodeSourceRelative = "1"; $coverageSymbols = "MON.sym"; -#$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"; +$ctcCommandPart1 = "ctcwrap -i d -n"; +$ctcCommandPart2 = "abld build winscw udeb"; +$ctcCommandPart2Test = "abld test build winscw udeb"; $ctcIgnoredPart1 = " -C \"EXCLUDE+"; $ctcIgnoredPart2 = "\" "; @@ -240,12 +239,11 @@ unlink("$eunitDstDllLocation$currentDllNameLine"); if ($currentBuildModeLine =~ /$eunitTestBuildMode/) { - doSystemCall("sbs -c winscw_udeb.test reallyclean "); + doSystemCall("abld test reallyclean winscw udeb "); } else { - #doSystemCall("sbs -c winscw_udeb reallyclean "); - doSystemCall("sbs REALLYCLEAN "); + doSystemCall("abld reallyclean winscw udeb "); } } else @@ -269,15 +267,16 @@ else { print("previous dll was not from same path - build all!\n"); + doSystemCall("bldmake bldfiles"); if ($currentBuildModeLine =~ /$eunitTestBuildMode/) - { - doSystemCall("sbs -c winscw_udeb.test reallyclean "); - doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2Test"); - } + { + doSystemCall("abld test reallyclean winscw udeb "); + doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2Test"); + } else { - doSystemCall("sbs REALLYCLEAN "); + doSystemCall("abld reallyclean winscw udeb "); doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2"); } }