Index: C:/Harmony/harmony/buildtest/trunk/config/copyres.xml =================================================================== --- C:/Harmony/harmony/buildtest/trunk/config/copyres.xml (revision 501347) +++ C:/Harmony/harmony/buildtest/trunk/config/copyres.xml (working copy) @@ -28,11 +28,11 @@ - - - - - + + + + + @@ -83,7 +83,7 @@ failonerror="false" mailhost="${mailhost}" subject="${subject}" > - + Index: C:/Harmony/harmony/buildtest/trunk/HUT_iterative/config/config-HUT_iterative.xml =================================================================== --- C:/Harmony/harmony/buildtest/trunk/HUT_iterative/config/config-HUT_iterative.xml (revision 501347) +++ C:/Harmony/harmony/buildtest/trunk/HUT_iterative/config/config-HUT_iterative.xml (working copy) @@ -24,6 +24,8 @@ + + @@ -42,8 +44,8 @@ - - + + @@ -191,7 +193,7 @@ - + @@ -207,7 +209,7 @@ - + Index: C:/Harmony/harmony/buildtest/trunk/HUT_iterative/cc.properties.example =================================================================== --- C:/Harmony/harmony/buildtest/trunk/HUT_iterative/cc.properties.example (revision 501347) +++ C:/Harmony/harmony/buildtest/trunk/HUT_iterative/cc.properties.example (working copy) @@ -26,4 +26,5 @@ HUT_iterative_cycle_timeout=259200 HUT_iterative_repetitions=50 HUT_iterative_forkmode=once +os_detailed=win XP ## Index: C:/Harmony/harmony/buildtest/trunk/HUT_iterative/HUT_iterative_run.bat =================================================================== --- C:/Harmony/harmony/buildtest/trunk/HUT_iterative/HUT_iterative_run.bat (revision 501347) +++ C:/Harmony/harmony/buildtest/trunk/HUT_iterative/HUT_iterative_run.bat (working copy) @@ -24,23 +24,48 @@ for /L %%A in (%start%,%step%,%ITER%) do ( echo %%i -call %ANT_COMMAND% -Dtest.jre.home=%JRE% -Dhy.test.vm.name=%VMNAME% -Dbuild.module=%%i -Dhy.test.forkmode=%FORKMODE% test 2>&1 > log_%%i_%%A.txt +call %ANT_COMMAND% -Dtest.jre.home=%JRE% -Dhy.test.vm.name=%VMNAME% -Dbuild.module=%%i -Dhy.test.forkmode=%FORKMODE% test > log_%%i_%%A.txt 2>&1 -rem type log_%%i_%%A.txt + type log_%%i_%%A.txt + + findstr /c:"BUILD FAILED" log_%%i_%%A.txt > FF - move build\test_report build\test_report_%%i_%%A - ) -) + for /F "tokens=*" %%j in (FF) do ( -for /F %%i in (modulesList) do ( - for /L %%A in (%start%,%step%,%ITER%) do ( + echo RESULT %%j + + if "%%j" == "BUILD FAILED" ( + + move build\test_report build\test_report_%%i_%%A + echo module %%i iteration %%A failed >> build/STATUS.txt - echo test_report_%%i_%%A >> build\test_report_length.txt - dir build\test_report_%%i_%%A | find /C "Test.xml" >> build\test_report_length.txt + ) + ) + findstr /c:"BUILD SUCCESSFUL" log_%%i_%%A.txt > FF + + for /F "tokens=*" %%j in (FF) do ( + + echo RESULT %%j + + if "%%j" == "BUILD SUCCESSFUL" ( + del /q build\test_report + echo module %%i iteration %%A passed >> build/STATUS.txt + ) + ) + ) ) +rem for /F %%i in (modulesList) do ( +rem for /L %%A in (%start%,%step%,%ITER%) do ( + +rem echo test_report_%%i_%%A >> build\test_report_length.txt +rem dir build\test_report_%%i_%%A | find /C "Test.xml" >> build\test_report_length.txt + +rem ) +rem ) + cd build rem find errors @@ -55,3 +80,4 @@ dir /O /S | find "Test.xml" | find " 0 TEST" >> ZERO_LENGTH.txt +exit 0 Index: C:/Harmony/harmony/buildtest/trunk/HUT_iterative/HUT_iterative_run.sh =================================================================== --- C:/Harmony/harmony/buildtest/trunk/HUT_iterative/HUT_iterative_run.sh (revision 501347) +++ C:/Harmony/harmony/buildtest/trunk/HUT_iterative/HUT_iterative_run.sh (working copy) @@ -34,7 +34,17 @@ -Dbuild.module=$moduleName -Dhy.test.forkmode=${FORKMODE} \ test 2>&1 | tee log_${moduleName}_${A}.txt - mv build/test_report build/test_report_${moduleName}_${A} + R=`grep "BUILD FAILED" log_${moduleName}_${A}.txt | wc -l` + + if [ "$R" = 0 ]; then + + rm -rf build/test_report + echo module ${moduleName} iteration ${A} passed >> build/STATUS.txt + else + + mv build/test_report build/test_report_${moduleName}_${A} + echo module ${moduleName} iteration ${A} failed >> build/STATUS.txt + fi A=`expr $A + 1` @@ -42,23 +52,23 @@ done -cat modulesList | while read moduleName; do +#cat modulesList | while read moduleName; do - echo $moduleName +# echo $moduleName - A=0 +# A=0 - while [ "$A" -lt `expr ${ITER}` ]; do +# while [ "$A" -lt `expr ${ITER}` ]; do - L=`ls -1 build/test_report_${moduleName}_${A} | grep xml | wc -l` +# L=`ls -1 build/test_report_${moduleName}_${A} | grep xml | wc -l` - echo build/test_report_${moduleName}_${A} $L >> build/test_report_length.txt +# echo build/test_report_${moduleName}_${A} $L >> build/test_report_length.txt - A=`expr $A + 1` +# A=`expr $A + 1` - done +# done -done +#done cd build