Index: build/make/targets/reg.test.xml =================================================================== --- build/make/targets/reg.test.xml (revision 572872) +++ build/make/targets/reg.test.xml (working copy) @@ -19,34 +19,15 @@ - + - - - - - - - - - - - - - - - - Is not designed for this platform! - - - - + @@ -86,7 +67,7 @@ - + @@ -97,12 +78,8 @@ - + + @@ -118,9 +95,9 @@ - + - + @@ -135,7 +112,7 @@ + to="\1/${shlib.prefix}\2${shlib.suffix}"/> @@ -167,7 +144,7 @@ link="shared" outfile="${reg.test.native.path}/${outfile}" objdir="${objdir}"> - + @@ -180,39 +157,16 @@ - + - - - - - - - + - - - - - - - - - - - ============================================== - Please set the classpath of junit as follows: - build.bat -Djunit.jar=%JUNIT_HOME% test - ============================================== - - - - + Index: build/make/targets/smoke.test.xml =================================================================== --- build/make/targets/smoke.test.xml (revision 572872) +++ build/make/targets/smoke.test.xml (working copy) @@ -15,15 +15,15 @@ limitations under the License. --> + + + - - - + + + + - - - - @@ -40,27 +40,17 @@ - + - - + + - - - - - - - - - - + + @@ -86,7 +76,7 @@ multithreaded="true" link="shared" outfile="${smoke.test.native.path}/${outputdir}/${outputfile}"> - + @@ -100,35 +90,25 @@ - + - - - - - - - + - - - - - - + - + - - - - + + ================================== + Tested JVM: ${test.jvm.exe} + ================================== + @@ -139,19 +119,8 @@ - - - - - - - - - - - - - + + @@ -171,28 +140,22 @@ Smoke tests on ${mode.name} ================================== - - - - - - - -Using exclude file = ${exclude.file} -${foo} - - - + + + + - - - - - + + + + + @@ -216,163 +179,82 @@ - - - - - - + + + + - - - - - - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + + + + + + + + - + - - - - - - - -]]> - - - - - - - - - - -]]> - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -381,6 +263,7 @@ - + + Index: build/make/targets/unit.test.xml =================================================================== --- build/make/targets/unit.test.xml (revision 572872) +++ build/make/targets/unit.test.xml (working copy) @@ -15,40 +15,45 @@ limitations under the License. --> + + + + + + - - + + - + - - - + + + + - - - + + - - - - - - - + + Index: build/make/targets/kernel.test.xml =================================================================== --- build/make/targets/kernel.test.xml (revision 572872) +++ build/make/targets/kernel.test.xml (working copy) @@ -17,23 +17,28 @@ --> + + - + + - - - - - - - - + + + + + + ================================== + Tested JVM: ${test.jvm.exe} + ================================== + + + @@ -41,115 +46,72 @@ - + - - - - - - + - + - + - Please find detailed results under ${kernel.test.dir}/reports directory. + Please find detailed results under ${kernel.test.dir}${file.separator}reports directory. - + - + - - - - - - + + - - - - - - - - - - - ============================================== - Please set the classpath of junit as follows: - build.bat -Djunit.jar=%JUNIT_HOME% test - ============================================== - - - - + + + + ================================== - Run kernel tests using ${kernel.mode.name} + Run kernel tests using ${kernel.mode.name} ================================== - - - - - - - -Using exclude file = ${exclude.file} -${foo} - - - - - - - + + - + - - - + @@ -159,7 +121,7 @@ - ${kernel.mode.name} ${kernel.status}${line.separator} Index: build/make/targets/reg.test.run.xml =================================================================== --- build/make/targets/reg.test.run.xml (revision 572872) +++ build/make/targets/reg.test.run.xml (working copy) @@ -17,9 +17,8 @@ - - - + + @@ -28,29 +27,15 @@ + -===================================== -DRLVM Regression Testing on platform: ${hy.platform} -===================================== + ===================================== + Tested JVM: ${test.jvm.exe} + ===================================== - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - + + - - - - - - + dir="${hdk.lib.dir}" /> - + dir="${hdk.lib.dir}" /> + - - - - - - - - + + + + + + + + + - + - + outputproperty="outputproperty" + timeout="${test.timeout}"> - - + + + - + - - - + - - - - - - - - - - + + + - - - - - ]]> - - - - - - - - - - - - ]]> - - - - - - - + + - + - + - + + - - - - - - - - - - - - + + + + - - + + + + + + + + + - Index: build/make/targets/test.common.xml =================================================================== --- build/make/targets/test.common.xml (revision 0) +++ build/make/targets/test.common.xml (revision 0) @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ============================================== + The @{name} is not found at ${@{name}} + Please specify the location as follows: + build.bat -D@{name}=path test + ============================================== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Using exclude file = ${@{name}} : + +${@{file}.content} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @MSG@ + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + Index: build/make/targets/jvmti.test.xml =================================================================== --- build/make/targets/jvmti.test.xml (revision 572872) +++ build/make/targets/jvmti.test.xml (working copy) @@ -15,60 +15,40 @@ limitations under the License. --> + + + - + + - - - + - - - + - + + + + + + - - - - - - + + - - - - - - - - - - - - - - - + - - - + + - + - + @@ -95,96 +75,47 @@ - + - - - - - - - + - - - - - - - - - - - ============================================== - Please set the classpath of junit as follows: - build.bat -Djunit.jar=%JUNIT_HOME% test - ============================================== - - - - - - - + + + + + ================================== Run JVMTI tests using ${mode.name} ================================== - - - - - - - -Using exclude file = ${exclude.file} - -${foo} - - - - - - - - + + + - - + - - - + jvm="${test.jvm.exe}"> + @@ -192,14 +123,14 @@ - + - + @@ -208,7 +139,6 @@ - @@ -225,7 +155,7 @@ - - + + Index: build/make/targets/build.java.xml =================================================================== --- build/make/targets/build.java.xml (revision 572872) +++ build/make/targets/build.java.xml (working copy) @@ -24,8 +24,8 @@ Index: build/make/test.properties =================================================================== --- build/make/test.properties (revision 572872) +++ build/make/test.properties (working copy) @@ -22,8 +22,13 @@ # # time limit to complete test run # in units of milliseconds -test.timeout=3600000 +test.timeout=1800000 +# per single jvmti test +jvmti.test.timeout=180000 +# per single regression test +reg.test.timeout=600000 + # -------------------------------------------- # # kernel.test.failfast @@ -31,7 +36,7 @@ # determines if tests should continue on failure # valid values are "off" and "on" # -kernel.test.failfast=off +test.failfast=off # -------------------------------------------- # @@ -49,7 +54,7 @@ # # additional arguments for vm to run tests # -test.vmargs= +test.vmargs=-XX:-vm.assert_dialog #-------------------------------------------- # @@ -83,8 +88,11 @@ # ECLIPSE_HOME environment variable points to existing Eclipse installation eclipse.mirror=http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/eclipse/downloads/drops/R-3.2.1-200609210945 +eclipse-3.3.mirror=http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/eclipse/downloads/drops/R-3.3-200706251500 eclipse.win.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32.zip +#eclipse.win.x86.url=${eclipse-3.3.mirror}/eclipse-SDK-3.3-win32.zip eclipse.win.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-x86_64.zip +#eclipse.win.x86_64.url=${eclipse-3.3.mirror}/eclipse-SDK-3.3-win32-x86_64.zip eclipse.win.ia64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-ia64.zip eclipse.linux.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk.tar.gz eclipse.linux.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk-x86_64.tar.gz Index: build/make/build.xml =================================================================== --- build/make/build.xml (revision 573237) +++ build/make/build.xml (working copy) @@ -338,7 +338,7 @@ - +