Skip to content
Snippets Groups Projects
Commit ea30f2b8 authored by david_williams's avatar david_williams
Browse files

tweak so head builder can work in maintenance

parent 53096fcd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 63 additions and 55 deletions
releng.wtpbuilder/distribution/patches.tests/build.xml
+ 0
− 7
View file @ ea30f2b8
......@@ -84,10 +84,6 @@
for this distribution, dependencies come from releng. Assume
no subdirectory, if not otherwise set (bug 285383).
-->
<!--
if not otherwise set, assume its a legacy case that did not
use this
-->
<property
name="env.DEP_DIR"
value=""/>
......@@ -164,9 +160,6 @@
<property
name="test-vm"
value="${env.JAVA_5_HOME}/bin/java"/>
<property
name="plugin-path"
value="${testRoot}/eclipse/plugins"/>
<property
name="vmargs"
value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
......
releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
+ 30
− 18
View file @ ea30f2b8
......@@ -10,7 +10,7 @@
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
level="debug"
level="info"
message="keyCfgFile: ${keyCfgFile}"/>
<property
file="${keyCfgFile}"/>
......@@ -23,9 +23,10 @@
dir="${junit-report-output}/raw"/>
<!--
if not otherwise set, be sure extraVMargs is at least some
string, even if unused string. Remember, though, extraVMArgs
can contain more than one extra arg, so much be passed to VM
as a "line", not "value".
string, even if unused string.
Remember, though, extraVMArgs can contain more than one extra arg,
so much be passed to VM as a "line", not "value".
-->
<property
name="extraVMargs"
......@@ -39,9 +40,12 @@
name="testRoot"
value="${testRoot}"/>
<!--
Some common values, of milliseconds to more recognizable
units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
1800000: 30 minutes 600000: 10 minutes
Some common values, of milliseconds to more recognizable units:
14400000: 4 hours
7200000: 2 hours
3600000: 1 hour
1800000: 30 minutes
600000: 10 minutes
-->
<property
name="timeout"
......@@ -62,16 +66,16 @@
file="${ant.file}"
property="currentDir"/>
<echo
level="debug"
level="info"
message="data-dir: ${data-dir}"/>
<echo
level="debug"
level="info"
message="plugin-name: ${plugin-name}"/>
<echo
level="debug"
level="info"
message="testPlugin: ${testPlugin}"/>
<echo
level="debug"
level="info"
message="classname: ${classname}"/>
<echo
level="info"
......@@ -89,19 +93,19 @@
level="debug"
message="eclipse-home: ${eclipse-home}"/>
<echo
level="debug"
level="info"
message="junit-report-output: ${junit-report-output}"/>
<echo
level="debug"
level="info"
message="test-output: ${test-output}"/>
<echo
level="debug"
level="info"
message="buildDirectory: ${buildDirectory}"/>
<echo
level="debug"
level="info"
message="buildLabel: ${buildLabel}"/>
<echo
level="debug"
level="info"
message="jvm: ${jvm}"/>
</target>
<target
......@@ -141,7 +145,7 @@
level="info"
message="Running ${classname}"/>
<echo
level="debug"
level="info"
message="Result file: ${junit-report-output}/${classname}.xml."/>
<echo
level="debug"
......@@ -161,6 +165,10 @@
message="xulRunnerParam: ${xulRunnerParam}"/>
<echo
message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
<echo
message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
<echo
message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
<!--
If there is not exactly one launcher in the stack, we'd best
fail fast, since we are not expecting that, and may indicate
......@@ -200,7 +208,7 @@
<jvmarg
value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
<jvmarg
value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
<jvmarg
value="-Dwtp.autotest.noninteractive=true"/>
<jvmarg
......@@ -213,6 +221,10 @@
value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
<arg
value="-nosplash"/>
<arg
value="-consolelog"/>
<arg
value="-debug"/>
<arg
value="-data"/>
<arg
......
releng.wtpbuilder/distribution/patches3.tests/build.xml
+ 0
− 9
View file @ ea30f2b8
......@@ -84,10 +84,6 @@
for this distribution, dependencies come from releng. Assume
no subdirectory, if not otherwise set (bug 285383).
-->
<!--
if not otherwise set, assume its a legacy case that did not
use this
-->
<property
name="env.DEP_DIR"
value=""/>
......@@ -164,9 +160,6 @@
<property
name="test-vm"
value="${env.JAVA_5_HOME}/bin/java"/>
<property
name="plugin-path"
value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
<property
name="vmargs"
value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
......@@ -233,8 +226,6 @@
value="-Dos=${env.BASEOS}"/>
<jvmarg
value="-Darch=${env.BASEARCH}"/>
<jvmarg
value="-Dnoclean=true"/>
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
......
releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml
+ 30
− 18
View file @ ea30f2b8
......@@ -10,7 +10,7 @@
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
level="debug"
level="info"
message="keyCfgFile: ${keyCfgFile}"/>
<property
file="${keyCfgFile}"/>
......@@ -23,9 +23,10 @@
dir="${junit-report-output}/raw"/>
<!--
if not otherwise set, be sure extraVMargs is at least some
string, even if unused string. Remember, though, extraVMArgs
can contain more than one extra arg, so much be passed to VM
as a "line", not "value".
string, even if unused string.
Remember, though, extraVMArgs can contain more than one extra arg,
so much be passed to VM as a "line", not "value".
-->
<property
name="extraVMargs"
......@@ -39,9 +40,12 @@
name="testRoot"
value="${testRoot}"/>
<!--
Some common values, of milliseconds to more recognizable
units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
1800000: 30 minutes 600000: 10 minutes
Some common values, of milliseconds to more recognizable units:
14400000: 4 hours
7200000: 2 hours
3600000: 1 hour
1800000: 30 minutes
600000: 10 minutes
-->
<property
name="timeout"
......@@ -62,16 +66,16 @@
file="${ant.file}"
property="currentDir"/>
<echo
level="debug"
level="info"
message="data-dir: ${data-dir}"/>
<echo
level="debug"
level="info"
message="plugin-name: ${plugin-name}"/>
<echo
level="debug"
level="info"
message="testPlugin: ${testPlugin}"/>
<echo
level="debug"
level="info"
message="classname: ${classname}"/>
<echo
level="info"
......@@ -89,19 +93,19 @@
level="debug"
message="eclipse-home: ${eclipse-home}"/>
<echo
level="debug"
level="info"
message="junit-report-output: ${junit-report-output}"/>
<echo
level="debug"
level="info"
message="test-output: ${test-output}"/>
<echo
level="debug"
level="info"
message="buildDirectory: ${buildDirectory}"/>
<echo
level="debug"
level="info"
message="buildLabel: ${buildLabel}"/>
<echo
level="debug"
level="info"
message="jvm: ${jvm}"/>
</target>
<target
......@@ -141,7 +145,7 @@
level="info"
message="Running ${classname}"/>
<echo
level="debug"
level="info"
message="Result file: ${junit-report-output}/${classname}.xml."/>
<echo
level="debug"
......@@ -161,6 +165,10 @@
message="xulRunnerParam: ${xulRunnerParam}"/>
<echo
message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
<echo
message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
<echo
message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
<!--
If there is not exactly one launcher in the stack, we'd best
fail fast, since we are not expecting that, and may indicate
......@@ -207,7 +215,7 @@
<jvmarg
value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
<jvmarg
value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
<jvmarg
value="-Dwtp.autotest.noninteractive=true"/>
<jvmarg
......@@ -221,6 +229,10 @@
value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
<arg
value="-nosplash"/>
<arg
value="-consolelog"/>
<arg
value="-debug"/>
<arg
value="-data"/>
<arg
......
releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+ 3
− 3
View file @ ea30f2b8
......@@ -66,13 +66,13 @@
file="${ant.file}"
property="currentDir"/>
<echo
level="debug"
level="info"
message="data-dir: ${data-dir}"/>
<echo
level="debug"
level="info"
message="plugin-name: ${plugin-name}"/>
<echo
level="debug"
level="info"
message="classname: ${classname}"/>
<echo
level="info"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent