diff -r 6bb1b21d2484 -r 2f8f8080a020 phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/run_auto_tests_qt.bat --- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/run_auto_tests_qt.bat Fri Apr 16 14:58:25 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/run_auto_tests_qt.bat Mon May 03 12:31:11 2010 +0300 @@ -54,14 +54,19 @@ set INSTRUMENT=TRUE set REMOVEINSTRUMENT=TRUE set DOMODULESTESTS=TRUE -set ABLD_CALL=abld build winscw udeb -keepgoing +set SBS_CALL=sbs --config winscw_udeb --keepgoing BUILD set PATH_TO_DLL=\epoc32\release\winscw\udeb set PATH_TO_COVERAGE_DATA=\coverage_data +set PATH_TO_RESULT=\test_result if not exist %PATH_TO_COVERAGE_DATA% ( mkdir %PATH_TO_COVERAGE_DATA% ) +if not exist %PATH_TO_RESULT% ( +mkdir %PATH_TO_RESULT% +) + if [%1] EQU [] ( goto default ) call :%1 @@ -132,12 +137,11 @@ pushd . call cd %1 call qmake -call bldmake bldfiles -call abld clean winscw udeb +call sbs --config winscw_udeb --keepgoing CLEAN if [%INSTRUMENT%] EQU [TRUE] ( -call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" %ABLD_CALL% +call ctcwrap -2comp -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%" ) else ( -call %ABLD_CALL% +call %SBS_CALL% ) popd @@ -152,7 +156,10 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::: :RUNTESTS echo Running tests -for /f %%a in ('dir /b ut_*') do call %PATH_TO_DLL%\%%a.exe +for /f %%a in ('dir /b ut_*') do ( + call %PATH_TO_DLL%\%%a.exe + move \epoc32\winscw\c\data\%%a.log %PATH_TO_RESULT%\%%a.log +) goto end ::::::::::::::::::::::::::::::::::::::::::::::::::::::