You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/02/20 11:05:24 UTC
svn commit: r509489 - in /harmony/enhanced/buildtest/trunk:
HUT_iterative/HUT_iterative_run.bat HUT_iterative/HUT_iterative_run.sh
HUT_iterative/build.xml HUT_iterative/cc.properties.example
HUT_iterative/config/config-HUT_iterative.xml config/copyres.xml
Author: smishura
Date: Tue Feb 20 02:05:23 2007
New Revision: 509489
URL: http://svn.apache.org/viewvc?view=rev&rev=509489
Log:
Apply second (slightly modified) patch for HARMONY-2655:
[buildtest][cc]iterative classlib tests runs incorporating
Tested on Windows
Modified:
harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.bat
harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.sh
harmony/enhanced/buildtest/trunk/HUT_iterative/build.xml
harmony/enhanced/buildtest/trunk/HUT_iterative/cc.properties.example
harmony/enhanced/buildtest/trunk/HUT_iterative/config/config-HUT_iterative.xml
harmony/enhanced/buildtest/trunk/config/copyres.xml
Modified: harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.bat
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.bat?view=diff&rev=509489&r1=509488&r2=509489
==============================================================================
--- harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.bat (original)
+++ harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.bat Tue Feb 20 02:05:23 2007
@@ -24,22 +24,46 @@
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
-
- move build\test_report build\test_report_%%i_%%A
+ type log_%%i_%%A.txt
+
+ findstr /c:"BUILD FAILED" log_%%i_%%A.txt > FF
+
+ for /F "tokens=*" %%j in (FF) 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
+
+ )
+ )
+
+ findstr /c:"BUILD SUCCESSFUL" log_%%i_%%A.txt > FF
+
+ for /F "tokens=*" %%j in (FF) do (
+
+ echo RESULT %%j
+
+ if "%%j" == "BUILD SUCCESSFUL" (
+ echo module %%i iteration %%A passed >> build/STATUS.txt
+ )
+ )
+
)
)
-for /F %%i in (modulesList) do (
- for /L %%A in (%start%,%step%,%ITER%) do (
+rem for /F %%i in (modulesList) do (
+rem for /L %%A in (%start%,%step%,%ITER%) do (
- 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
+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
@@ -55,3 +79,4 @@
dir /O /S | find "Test.xml" | find " 0 TEST" >> ZERO_LENGTH.txt
+exit 0
Modified: harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.sh
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.sh?view=diff&rev=509489&r1=509488&r2=509489
==============================================================================
--- harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.sh (original)
+++ harmony/enhanced/buildtest/trunk/HUT_iterative/HUT_iterative_run.sh Tue Feb 20 02:05:23 2007
@@ -34,7 +34,16 @@
-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
+
+ 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 +51,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
Modified: harmony/enhanced/buildtest/trunk/HUT_iterative/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/HUT_iterative/build.xml?view=diff&rev=509489&r1=509488&r2=509489
==============================================================================
--- harmony/enhanced/buildtest/trunk/HUT_iterative/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/HUT_iterative/build.xml Tue Feb 20 02:05:23 2007
@@ -30,6 +30,7 @@
HUT_iterative_timeout=${HUT_iterative_cycle_timeout}
HUT_iterations=${HUT_iterative_repetitions}
HUT_forkmode=${HUT_iterative_forkmode}
+osdetailed=${os_detailed}
fs=${file.separator}
</echo>
Modified: harmony/enhanced/buildtest/trunk/HUT_iterative/cc.properties.example
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/HUT_iterative/cc.properties.example?view=diff&rev=509489&r1=509488&r2=509489
==============================================================================
--- harmony/enhanced/buildtest/trunk/HUT_iterative/cc.properties.example (original)
+++ harmony/enhanced/buildtest/trunk/HUT_iterative/cc.properties.example Tue Feb 20 02:05:23 2007
@@ -26,4 +26,5 @@
HUT_iterative_cycle_timeout=259200
HUT_iterative_repetitions=50
HUT_iterative_forkmode=once
+os_detailed=win XP
##
Modified: harmony/enhanced/buildtest/trunk/HUT_iterative/config/config-HUT_iterative.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/HUT_iterative/config/config-HUT_iterative.xml?view=diff&rev=509489&r1=509488&r2=509489
==============================================================================
--- harmony/enhanced/buildtest/trunk/HUT_iterative/config/config-HUT_iterative.xml (original)
+++ harmony/enhanced/buildtest/trunk/HUT_iterative/config/config-HUT_iterative.xml Tue Feb 20 02:05:23 2007
@@ -24,6 +24,8 @@
<property name="vm.prefix" value="[build-test alert] BUILD FAILED ${os} ${cc} debug: drlvm"/>
<property name="cl.prefix.ok" value="[build-test alert] BUILD FIXED ${os} ${cc} debug: classlib "/>
<property name="vm.prefix.ok" value="[build-test alert] BUILD FIXED ${os} ${cc} debug: drlvm"/>
+ <property name="HUT-iterative.prefix" value="[build-test alert] BUILD FAILED ${osdetailed} ${cc} debug: classlib tests iterative"/>
+ <property name="HUT-iterative.prefix.ok" value="[build-test alert] BUILD FIXED ${osdetailed} ${cc} debug: classlib tests iterative"/>
<project name="classlib">
@@ -42,8 +44,8 @@
<schedule interval="${timeout}">
<ant target="fetch-depends rebuild" antWorkingDir="projects/${project.name}/trunk" timeout="${ttimeout}" usedebug="false">
- <property name="${proxy.host.property}" value="${proxy.value}"/>
- <property name="${proxy.port.property}" value="${port.value}"/>
+ <jvmarg arg="-D${proxy.host.property}=${proxy.value}"/>
+ <jvmarg arg="-D${proxy.port.property}=${port.value}"/>
<jvmarg arg="-Xms200M" />
<jvmarg arg="-Xmx700M" />
</ant>
@@ -191,7 +193,7 @@
<property name="mailhost" value="${server_addr}"/>
<property name="fromaddress" value="${report_from}"/>
<property name="toaddress" value="${report_to}"/>
- <property name="subject" value="${cl.prefix} over drlvm"/>
+ <property name="subject" value="${HUT-iterative.prefix}"/>
<property name="flag" value="${project.name}"/>
</antpublisher>
</onfailure>
@@ -207,7 +209,7 @@
<property name="mailhost" value="${server_addr}"/>
<property name="fromaddress" value="${report_from}"/>
<property name="toaddress" value="${report_to}"/>
- <property name="subject" value="${cl.prefix.ok} over drlvm"/>
+ <property name="subject" value="${HUT-iterative.prefix.ok}"/>
<property name="flag" value="${project.name}"/>
</antpublisher>
</onsuccess>
Modified: harmony/enhanced/buildtest/trunk/config/copyres.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/config/copyres.xml?view=diff&rev=509489&r1=509488&r2=509489
==============================================================================
--- harmony/enhanced/buildtest/trunk/config/copyres.xml (original)
+++ harmony/enhanced/buildtest/trunk/config/copyres.xml Tue Feb 20 02:05:23 2007
@@ -28,11 +28,11 @@
</zip>
</target>
<target name="copy.HUT-iterative.res">
- <zip destfile="projects/classlib/trunk/results_${VM}_${timestampfull}.zip" >
- <zipfileset dir="projects/classlib/trunk/build" includes="test_report_*/**/*" />
- <zipfileset dir="projects/classlib/trunk/build" includes="FAILURES.txt, ERRORS.txt, ZERO_LENGTH.txt, test_report_length.txt" prefix="result" />
- <zipfileset dir="projects/classlib/trunk" includes="log_*.txt" prefix="logs" />
- </zip>
+ <zip destfile="projects/classlib/trunk/results_${VM}_${timestampfull}.zip" >
+ <zipfileset dir="projects/classlib/trunk/build" includes="test_report_*/**/*" />
+ <zipfileset dir="projects/classlib/trunk/build" includes="FAILURES.txt, ERRORS.txt, ZERO_LENGTH.txt, STATUS.txt" prefix="result" />
+ <zipfileset dir="projects/classlib/trunk" includes="log_*.txt" prefix="logs" />
+ </zip>
</target>
<target name="copy.vm.res">
@@ -83,7 +83,7 @@
failonerror="false"
mailhost="${mailhost}"
subject="${subject}" >
- <fileset dir="projects/classlib/trunk/build" includes="FAILURES.txt, ERRORS.txt, ZERO_LENGTH.txt, test_report_length.txt" />
+ <fileset dir="projects/classlib/trunk/build" includes="FAILURES.txt, ERRORS.txt, ZERO_LENGTH.txt, STATUS.txt" />
</mail>
<delete dir="projects/classlib/trunk/build" />
<delete>