change to 'repository'
diff --git a/releng.wtpbuilder/components/wstfproj_tests/build.properties b/releng.wtpbuilder/components/wstfproj_tests/build.properties deleted file mode 100644 index 4d26330..0000000 --- a/releng.wtpbuilder/components/wstfproj_tests/build.properties +++ /dev/null
@@ -1,46 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -# This property file is used automatically by the PDE build process - -runPackager=true - -# This is a subdirectory of $buildDirectory -# Set collectingFolder and archivePrefix to . if you want to create archives without -# trailing eclipse in the paths of the included files -collectingFolder=eclipse -logExtension=.xml -# The prefix that will be used in the generated archive. -# Does not make sense to use a different archivePrefix than collectingFolder, -# because zip wouldn't find any files to include into the target zip otherwise -archivePrefix=eclipse - -# Whether or not to include debug info in the output jars -javacDebugInfo=true - -# Whether or not to fail the build if there are compiler errors -javacFailOnError=false - -################################################## -# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when -# using the JDT Compiler Adapter to compile. -javacVerbose=true - -sign=false - -############################################################# - -# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See -# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html - -flattenDependencies=true -parallelCompilation=true -
diff --git a/releng.wtpbuilder/components/wstfproj_tests/customTargets.xml b/releng.wtpbuilder/components/wstfproj_tests/customTargets.xml deleted file mode 100644 index b964d40..0000000 --- a/releng.wtpbuilder/components/wstfproj_tests/customTargets.xml +++ /dev/null
@@ -1,355 +0,0 @@ -<project - name="PDECustomTargets" - default="noDefault" - basedir="."> - <!-- - = = = standard properties pattern = = = Note to be - cross-platform, "environment variables" are only appropriate for - some variables, e.g. ones we set, since properties are case - sensitive, even if the environment variables on your operating - system are not, e.g. it will be ${env.Path} not ${env.PATH} on - Windows - --> - <property - environment="env"/> - <!-- - Let users override standard properties, if desired. If - directory, file, or some properties do not exist, then standard - properties will be used. - --> - <property - file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/> - - <!-- let this project specify properties, if not already set --> - <property - file="build.properties"/> - <fail - message="dependency.properties must be specified by distribution script" - unless="dependency.properties"/> - <fail - unless="buildDirectory" - message="buildDirectory must be set"/> - <echo - message="buildDirectory: ${buildDirectory}"/> - <!-- - Run a given ${target} on all elements being built Add on <ant> - task for each top level element being built. - --> - <target - name="allElements"> - <echo - level="info" - message="Target:${target} "/> - <echo - level="debug" - message="basedir: ${basedir}"/> - <echo - level="info" - message="component: ${component}"/> - <echo - level="debug" - message="buildDirectory: ${buildDirectory}"/> - <echo - level="debug" - message="baseLocation: ${baseLocation}"/> - <echo - level="debug" - message="generic target: ${genericTargets}"/> - <echo - message="compilerArg: ${compilerArg}"/> - <echo - message="individualSourceBundles: ${individualSourceBundles}"/> - <ant - antfile="${genericTargets}" - target="${target}"> - <property - name="type" - value="feature"/> - <property - name="id" - value="org.eclipse.wst.common.fproj_tests.feature"/> - </ant> - </target> - <!-- - Targets to assemble the built elements for particular - configurations These generally call the generated assemble - scripts (named in ${assembleScriptName}) but may also add pre - and post processing Add one target for each root element and - each configuration - --> - <target - name="assemble.org.eclipse.wst.common.fproj_tests.feature"> - <property - name="archiveName" - value="wst-common-fproj-tests-${buildLabel}.zip"/> - <ant - antfile="${assembleScriptName}" - dir="${buildDirectory}"/> - </target> - <target - name="prePackage"/> - <target - name="postPackage"> - <property - name="archiveName" - value="wst-common-fproj-tests-${buildLabel}.zip"/> - <ant - antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" - target="unpackUpdateJarsAndCreateZippedPackages"> - <property - name="buildDirectory" - value="${buildDirectory}"/> - <property - name="buildLabel" - value="${buildLabel}"/> - <property - name="archiveName" - value="${archiveName}"/> - </ant> - </target> - - <!-- - Check out map files from repository - --> - <target - name="getMapFiles"> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENG}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENGCOMMON}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - </target> - - - <!-- - Steps to do before setup - --> - <target - name="preSetup"></target> - <!-- - Steps to do after setup but before starting the build proper - --> - <target - name="postSetup"> - <dirname - file="${ant.file}" - property="component.dir"/> - <echo - level="debug" - message="ant.file: ${ant.file}"/> - <echo - level="debug" - message="component.dir: ${component.dir}"/> - - <!-- Get the dependencies --> - <antcall - target="getDependencies"/> - </target> - <!-- - ===================================================================== - --> - <!-- Get the dependencies based on releng maps --> - <!-- - ===================================================================== - --> - <target - name="getDependencies"> - <ant - antfile="${component.dir}/dependency.xml" - target="get"> - <property - name="base.install.dir" - value="${buildRoot}"/> - </ant> - </target> - - <!-- - Steps to do before fetching the build elements - --> - <target - name="preFetch"></target> - - <!-- - Steps to do after fetching the build elements - --> - <target - name="postFetch"></target> - - <!-- - Steps to do before generating the build scripts. - --> - <target - name="preGenerate"></target> - - <!-- - Steps to do after generating the build scripts. - --> - <target - name="postGenerate"> - <echo - message="buildDirectory: ${buildDirectory}"/> - <customizeAccessRules - bundleDirectory="${buildDirectory}/plugins"/> - </target> - <!-- - Steps to do before running the build.xmls for the elements being - built. - --> - <target - name="preProcess"> - <replace - dir="${buildDirectory}/plugins" - value="${timestamp}" - token="@build@"> - <include - name="**/about.mappings"/> - </replace> - </target> - <!-- - Steps to do after running the build.xmls for the elements being - built. - --> - <target - name="postProcess"> - <condition - property="logsAvailable"> - <istrue - value="${javacVerbose}"/> - </condition> - <antcall - target="gatherLogs"/> - </target> - - - <!-- - Steps to do before running assemble. - --> - <target - name="preAssemble"></target> - - <!-- - Steps to do after running assemble. - --> - <target - name="postAssemble"></target> - - <!-- - Steps to do after the build is done. - --> - <target - name="postBuild"></target> - - <!-- - Steps to do to test the build results - --> - <target - name="test"></target> - - <!-- - Steps to do to publish the build results - --> - <target - name="publish"></target> - - <!-- - Helper targets - --> - <target - name="gatherLogs" - if="logsAvailable"> - <mkdir - dir="${buildDirectory}/${buildLabel}/testcompilelogs"/> - <echo - level="debug" - message="logExtension: ${logExtension}"/> - <antcall - target="allElements"> - <param - name="target" - value="gatherLogs"/> - <param - name="logExtension" - value="${logExtension}"/> - </antcall> - <unzip - dest="${buildDirectory}/${buildLabel}/testcompilelogs" - overwrite="true"> - <fileset - dir="${buildDirectory}/features/org.eclipse.wst.common.fproj_tests.feature"> - <include - name="**/*.log.zip"/> - </fileset> - </unzip> - <!-- - TODO: it is unclear if the above "gather" and unzip do - anything constructive. I think not and should be removed - (after experimental run, of course. - --> - <!-- - workaround: see - https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070 - --> - <copy - todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins" - overwrite="true"> - <!-- - we want all @dot.xml files, but assumes a certain - structure, to include directory for name of plugin - --> - <fileset - dir="${buildDirectory}/features/"> - <include - name="**/feature.temp.folder/"/> - <exclude - name="**/*tests*feature*/feature.temp.folder/"/> - </fileset> - <compositemapper> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/@dot.xml" - to="/\2/@dot.xml"/> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/(.*)bin.xml" - to="/\2/\3bin.xml"/> - </compositemapper> - </copy> - </target> - <target - name="clean" - unless="noclean"> - <antcall - target="allElements"> - <param - name="target" - value="cleanElement"/> - </antcall> - </target> - - <!-- - Default target - --> - <target - name="noDefault"> - <echo - level="error" - message="You must specify a target when invoking this file"/> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/components/wstfproj_tests/dependency.xml b/releng.wtpbuilder/components/wstfproj_tests/dependency.xml deleted file mode 100644 index 71a922e..0000000 --- a/releng.wtpbuilder/components/wstfproj_tests/dependency.xml +++ /dev/null
@@ -1,244 +0,0 @@ -<?xml version="1.0"?> - <!-- - ====================================================================== - Properties that must be passed to this script: base.install.dir - dependencyTargets local.cache.dir dependency.properties - ====================================================================== - --> -<project - name="test" - default="get"> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="debug" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <condition - property="getprereq.eclipse"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.eclipseplatform"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emf"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfxsd"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfvalidation"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.gef"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.jst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dltk"> - <istrue - value="false"/> - </condition> - <target - name="get"> - <!-- - read in this properties, just so we can make sure our - requested pre-reqs are defined, which we do later with - statements such if="${groupId}.url" - --> - <property - file="${dependency.properties}"/> - <antcall - target="prereq.eclipse"/> - <antcall - target="prereq.eclipseplatform"/> - <antcall - target="prereq.emf"/> - <antcall - target="prereq.emfxsd"/> - <antcall - target="prereq.emfvalidation"/> - <antcall - target="prereq.gef"/> - <antcall - target="prereq.dtp"/> - <antcall - target="prereq.wst"/> - <antcall - target="prereq.jst"/> - <antcall - target="prereq.wtp"/> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipseTestFramework"/> - </antcall> - </target> - <target - name="prereq.eclipse" - if="getprereq.eclipse"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipse"/> - </antcall> - </target> - <target - name="prereq.eclipseplatform" - if="getprereq.eclipseplatform"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipseplatform"/> - </antcall> - </target> - <target - name="prereq.emf" - if="getprereq.emf"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emf"/> - </antcall> - </target> - <target - name="prereq.emfxsd" - if="getprereq.emfxsd"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfxsd"/> - </antcall> - </target> - <target - name="prereq.emfvalidation" - if="getprereq.emfvalidation"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfvalidation"/> - </antcall> - </target> - <target - name="prereq.gef" - if="getprereq.gef"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="gef"/> - </antcall> - </target> - <target - name="prereq.dtp" - if="getprereq.dtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dtp"/> - </antcall> - </target> - <target - name="prereq.wst" - if="getprereq.wst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wst"/> - </antcall> - </target> - <target - name="prereq.jst" - if="getprereq.jst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="jst"/> - </antcall> - </target> - <target - name="prereq.wtp" - if="getprereq.wtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wtp"/> - </antcall> - </target> - <target - name="prereq.dltk" - if="getprereq.dltk"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dltk"/> - </antcall> - </target> - <target - name="getAndInstall" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}"/> - </ant> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpcap_sdk/build.properties b/releng.wtpbuilder/components/wtpcap_sdk/build.properties deleted file mode 100644 index 5bed879..0000000 --- a/releng.wtpbuilder/components/wtpcap_sdk/build.properties +++ /dev/null
@@ -1,47 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -# This property file is used automatically by the PDE build process - -runPackager=true - -# This is a subdirectory of $buildDirectory -# Set collectingFolder and archivePrefix to . if you want to create archives without -# trailing eclipse in the paths of the included files -collectingFolder=eclipse -logExtension=.xml -# The prefix that will be used in the generated archive. -# Does not make sense to use a different archivePrefix than collectingFolder, -# because zip wouldn't find any files to include into the target zip otherwise -archivePrefix=eclipse - -# Whether or not to include debug info in the output jars -javacDebugInfo=true - -# Whether or not to fail the build if there are compiler errors -javacFailOnError=false - -################################################## -# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when -# using the JDT Compiler Adapter to compile. -javacVerbose=true - -sign=true - -############################################################# - -# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See -# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html - -flattenDependencies=true -parallelCompilation=true - -
diff --git a/releng.wtpbuilder/components/wtpcap_sdk/customTargets.xml b/releng.wtpbuilder/components/wtpcap_sdk/customTargets.xml deleted file mode 100644 index 300ecc6..0000000 --- a/releng.wtpbuilder/components/wtpcap_sdk/customTargets.xml +++ /dev/null
@@ -1,355 +0,0 @@ -<project - name="PDECustomTargets" - default="noDefault" - basedir="."> - <!-- - = = = standard properties pattern = = = Note to be - cross-platform, "environment variables" are only appropriate for - some variables, e.g. ones we set, since properties are case - sensitive, even if the environment variables on your operating - system are not, e.g. it will be ${env.Path} not ${env.PATH} on - Windows - --> - <property - environment="env"/> - <!-- - Let users override standard properties, if desired. If - directory, file, or some properties do not exist, then standard - properties will be used. - --> - <property - file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/> - - <!-- let this project specify properties, if not already set --> - <property - file="build.properties"/> - <fail - message="dependency.properties must be specified by distribution script" - unless="dependency.properties"/> - <fail - unless="buildDirectory" - message="buildDirectory must be set"/> - <echo - message="buildDirectory: ${buildDirectory}"/> - <!-- - Run a given ${target} on all elements being built Add on <ant> - task for each top level element being built. - --> - <target - name="allElements"> - <echo - level="info" - message="Target:${target} "/> - <echo - level="debug" - message="basedir: ${basedir}"/> - <echo - level="info" - message="component: ${component}"/> - <echo - level="debug" - message="buildDirectory: ${buildDirectory}"/> - <echo - level="debug" - message="baseLocation: ${baseLocation}"/> - <echo - level="debug" - message="generic target: ${genericTargets}"/> - <echo - message="compilerArg: ${compilerArg}"/> - <echo - message="individualSourceBundles: ${individualSourceBundles}"/> - <ant - antfile="${genericTargets}" - target="${target}"> - <property - name="type" - value="feature"/> - <property - name="id" - value="org.eclipse.wtp.capabilities_sdk.feature"/> - </ant> - </target> - <!-- - Targets to assemble the built elements for particular - configurations These generally call the generated assemble - scripts (named in ${assembleScriptName}) but may also add pre - and post processing Add one target for each root element and - each configuration - --> - <target - name="assemble.org.eclipse.wtp.capabilities_sdk.feature"> - <property - name="archiveName" - value="wtpcap-sdk-${buildLabel}.zip"/> - <ant - antfile="${assembleScriptName}" - dir="${buildDirectory}"/> - </target> - <target - name="prePackage"/> - <target - name="postPackage"> - <property - name="archiveName" - value="wtpcap-sdk-${buildLabel}.zip"/> - <ant - antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" - target="unpackUpdateJarsAndCreateZippedPackages"> - <property - name="buildDirectory" - value="${buildDirectory}"/> - <property - name="buildLabel" - value="${buildLabel}"/> - <property - name="archiveName" - value="${archiveName}"/> - </ant> - </target> - - <!-- - Check out map files from repository - --> - <target - name="getMapFiles"> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENG}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENG}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - </target> - - - <!-- - Steps to do before setup - --> - <target - name="preSetup"></target> - <!-- - Steps to do after setup but before starting the build proper - --> - <target - name="postSetup"> - <dirname - file="${ant.file}" - property="component.dir"/> - <echo - level="debug" - message="ant.file: ${ant.file}"/> - <echo - level="debug" - message="component.dir: ${component.dir}"/> - - <!-- Get the dependencies --> - <antcall - target="getDependencies"/> - </target> - <!-- - ===================================================================== - --> - <!-- Get the dependencies based on releng maps --> - <!-- - ===================================================================== - --> - <target - name="getDependencies"> - <ant - antfile="${component.dir}/dependency.xml" - target="get"> - <property - name="base.install.dir" - value="${buildRoot}"/> - </ant> - </target> - - <!-- - Steps to do before fetching the build elements - --> - <target - name="preFetch"></target> - - <!-- - Steps to do after fetching the build elements - --> - <target - name="postFetch"></target> - - <!-- - Steps to do before generating the build scripts. - --> - <target - name="preGenerate"></target> - - <!-- - Steps to do after generating the build scripts. - --> - <target - name="postGenerate"> - <echo - message="buildDirectory: ${buildDirectory}"/> - <customizeAccessRules - bundleDirectory="${buildDirectory}/plugins"/> - </target> - <!-- - Steps to do before running the build.xmls for the elements being - built. - --> - <target - name="preProcess"> - <replace - dir="${buildDirectory}/plugins" - value="${timestamp}" - token="@build@"> - <include - name="**/about.mappings"/> - </replace> - </target> - <!-- - Steps to do after running the build.xmls for the elements being - built. - --> - <target - name="postProcess"> - <condition - property="logsAvailable"> - <istrue - value="${javacVerbose}"/> - </condition> - <antcall - target="gatherLogs"/> - </target> - - - <!-- - Steps to do before running assemble. - --> - <target - name="preAssemble"></target> - - <!-- - Steps to do after running assemble. - --> - <target - name="postAssemble"></target> - - <!-- - Steps to do after the build is done. - --> - <target - name="postBuild"></target> - - <!-- - Steps to do to test the build results - --> - <target - name="test"></target> - - <!-- - Steps to do to publish the build results - --> - <target - name="publish"></target> - - <!-- - Helper targets - --> - <target - name="gatherLogs" - if="logsAvailable"> - <mkdir - dir="${buildDirectory}/${buildLabel}/compilelogs"/> - <echo - level="debug" - message="logExtension: ${logExtension}"/> - <antcall - target="allElements"> - <param - name="target" - value="gatherLogs"/> - <param - name="logExtension" - value="${logExtension}"/> - </antcall> - <unzip - dest="${buildDirectory}/${buildLabel}/compilelogs" - overwrite="true"> - <fileset - dir="${buildDirectory}/features/org.eclipse.wtp.capabilities_sdk.feature"> - <include - name="**/*.log.zip"/> - </fileset> - </unzip> - <!-- - TODO: it is unclear if the above "gather" and unzip do - anything constructive. I think not and should be removed - (after experimental run, of course. - --> - <!-- - workaround: see - https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070 - --> - <copy - todir="${buildDirectory}/${buildLabel}/compilelogs/plugins" - overwrite="true"> - <!-- - we want all @dot.xml files, but assumes a certain - structure, to include directory for name of plugin - --> - <fileset - dir="${buildDirectory}/features/"> - <include - name="**/feature.temp.folder/"/> - <exclude - name="**/*tests*feature*/feature.temp.folder/"/> - </fileset> - <compositemapper> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/@dot.xml" - to="/\2/@dot.xml"/> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/(.*)bin.xml" - to="/\2/\3bin.xml"/> - </compositemapper> - </copy> - </target> - <target - name="clean" - unless="noclean"> - <antcall - target="allElements"> - <param - name="target" - value="cleanElement"/> - </antcall> - </target> - - <!-- - Default target - --> - <target - name="noDefault"> - <echo - level="error" - message="You must specify a target when invoking this file"/> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpcap_sdk/dependency.xml b/releng.wtpbuilder/components/wtpcap_sdk/dependency.xml deleted file mode 100644 index c942bb3..0000000 --- a/releng.wtpbuilder/components/wtpcap_sdk/dependency.xml +++ /dev/null
@@ -1,240 +0,0 @@ -<?xml version="1.0"?> - <!-- - ====================================================================== - Properties that must be passed to this script: base.install.dir - dependencyTargets local.cache.dir dependency.properties - ====================================================================== - --> -<project - name="test" - default="get"> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="debug" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <condition - property="getprereq.eclipse"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.eclipseplatform"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emf"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfxsd"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfvalidation"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.gef"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.jst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dltk"> - <istrue - value="false"/> - </condition> - <target - name="get"> - <!-- - read in this properties, just so we can make sure our - requested pre-reqs are defined, which we do later with - statements such if="${groupId}.url" - --> - <property - file="${dependency.properties}"/> - <antcall - target="prereq.eclipse"/> - <antcall - target="prereq.eclipseplatform"/> - <antcall - target="prereq.emf"/> - <antcall - target="prereq.emfxsd"/> - <antcall - target="prereq.emfvalidation"/> - <antcall - target="prereq.gef"/> - <antcall - target="prereq.dtp"/> - <antcall - target="prereq.wst"/> - <antcall - target="prereq.jst"/> - <antcall - target="prereq.wtp"/> - <antcall - target="prereq.dltk"/> - </target> - <target - name="prereq.eclipse" - if="getprereq.eclipse"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipse"/> - </antcall> - </target> - <target - name="prereq.eclipseplatform" - if="getprereq.eclipseplatform"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipseplatform"/> - </antcall> - </target> - <target - name="prereq.emf" - if="getprereq.emf"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emf"/> - </antcall> - </target> - <target - name="prereq.emfxsd" - if="getprereq.emfxsd"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfxsd"/> - </antcall> - </target> - <target - name="prereq.emfvalidation" - if="getprereq.emfvalidation"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfvalidation"/> - </antcall> - </target> - <target - name="prereq.gef" - if="getprereq.gef"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="gef"/> - </antcall> - </target> - <target - name="prereq.dtp" - if="getprereq.dtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dtp"/> - </antcall> - </target> - <target - name="prereq.wst" - if="getprereq.wst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wst"/> - </antcall> - </target> - <target - name="prereq.jst" - if="getprereq.jst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="jst"/> - </antcall> - </target> - <target - name="prereq.wtp" - if="getprereq.wtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wtp"/> - </antcall> - </target> - <target - name="prereq.dltk" - if="getprereq.dltk"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dltk"/> - </antcall> - </target> - <target - name="getAndInstall" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}"/> - </ant> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpcap_tests/build.properties b/releng.wtpbuilder/components/wtpcap_tests/build.properties deleted file mode 100644 index 4d26330..0000000 --- a/releng.wtpbuilder/components/wtpcap_tests/build.properties +++ /dev/null
@@ -1,46 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -# This property file is used automatically by the PDE build process - -runPackager=true - -# This is a subdirectory of $buildDirectory -# Set collectingFolder and archivePrefix to . if you want to create archives without -# trailing eclipse in the paths of the included files -collectingFolder=eclipse -logExtension=.xml -# The prefix that will be used in the generated archive. -# Does not make sense to use a different archivePrefix than collectingFolder, -# because zip wouldn't find any files to include into the target zip otherwise -archivePrefix=eclipse - -# Whether or not to include debug info in the output jars -javacDebugInfo=true - -# Whether or not to fail the build if there are compiler errors -javacFailOnError=false - -################################################## -# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when -# using the JDT Compiler Adapter to compile. -javacVerbose=true - -sign=false - -############################################################# - -# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See -# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html - -flattenDependencies=true -parallelCompilation=true -
diff --git a/releng.wtpbuilder/components/wtpcap_tests/customTargets.xml b/releng.wtpbuilder/components/wtpcap_tests/customTargets.xml deleted file mode 100644 index 31e758c..0000000 --- a/releng.wtpbuilder/components/wtpcap_tests/customTargets.xml +++ /dev/null
@@ -1,355 +0,0 @@ -<project - name="PDECustomTargets" - default="noDefault" - basedir="."> - <!-- - = = = standard properties pattern = = = Note to be - cross-platform, "environment variables" are only appropriate for - some variables, e.g. ones we set, since properties are case - sensitive, even if the environment variables on your operating - system are not, e.g. it will be ${env.Path} not ${env.PATH} on - Windows - --> - <property - environment="env"/> - <!-- - Let users override standard properties, if desired. If - directory, file, or some properties do not exist, then standard - properties will be used. - --> - <property - file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/> - - <!-- let this project specify properties, if not already set --> - <property - file="build.properties"/> - <fail - message="dependency.properties must be specified by distribution script" - unless="dependency.properties"/> - <fail - unless="buildDirectory" - message="buildDirectory must be set"/> - <echo - message="buildDirectory: ${buildDirectory}"/> - <!-- - Run a given ${target} on all elements being built Add on <ant> - task for each top level element being built. - --> - <target - name="allElements"> - <echo - level="info" - message="Target:${target} "/> - <echo - level="debug" - message="basedir: ${basedir}"/> - <echo - level="info" - message="component: ${component}"/> - <echo - level="debug" - message="buildDirectory: ${buildDirectory}"/> - <echo - level="debug" - message="baseLocation: ${baseLocation}"/> - <echo - level="debug" - message="generic target: ${genericTargets}"/> - <echo - message="compilerArg: ${compilerArg}"/> - <echo - message="individualSourceBundles: ${individualSourceBundles}"/> - <ant - antfile="${genericTargets}" - target="${target}"> - <property - name="type" - value="feature"/> - <property - name="id" - value="org.eclipse.wtp.capabilities_tests.feature"/> - </ant> - </target> - <!-- - Targets to assemble the built elements for particular - configurations These generally call the generated assemble - scripts (named in ${assembleScriptName}) but may also add pre - and post processing Add one target for each root element and - each configuration - --> - <target - name="assemble.org.eclipse.wtp.capabilities_tests.feature"> - <property - name="archiveName" - value="wtpcap-tests-${buildLabel}.zip"/> - <ant - antfile="${assembleScriptName}" - dir="${buildDirectory}"/> - </target> - <target - name="prePackage"/> - <target - name="postPackage"> - <property - name="archiveName" - value="wtpcap-tests-${buildLabel}.zip"/> - <ant - antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" - target="unpackUpdateJarsAndCreateZippedPackages"> - <property - name="buildDirectory" - value="${buildDirectory}"/> - <property - name="buildLabel" - value="${buildLabel}"/> - <property - name="archiveName" - value="${archiveName}"/> - </ant> - </target> - - <!-- - Check out map files from repository - --> - <target - name="getMapFiles"> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENG}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENG}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - </target> - - - <!-- - Steps to do before setup - --> - <target - name="preSetup"></target> - <!-- - Steps to do after setup but before starting the build proper - --> - <target - name="postSetup"> - <dirname - file="${ant.file}" - property="component.dir"/> - <echo - level="debug" - message="ant.file: ${ant.file}"/> - <echo - level="debug" - message="component.dir: ${component.dir}"/> - - <!-- Get the dependencies --> - <antcall - target="getDependencies"/> - </target> - <!-- - ===================================================================== - --> - <!-- Get the dependencies based on releng maps --> - <!-- - ===================================================================== - --> - <target - name="getDependencies"> - <ant - antfile="${component.dir}/dependency.xml" - target="get"> - <property - name="base.install.dir" - value="${buildRoot}"/> - </ant> - </target> - - <!-- - Steps to do before fetching the build elements - --> - <target - name="preFetch"></target> - - <!-- - Steps to do after fetching the build elements - --> - <target - name="postFetch"></target> - - <!-- - Steps to do before generating the build scripts. - --> - <target - name="preGenerate"></target> - - <!-- - Steps to do after generating the build scripts. - --> - <target - name="postGenerate"> - <echo - message="buildDirectory: ${buildDirectory}"/> - <customizeAccessRules - bundleDirectory="${buildDirectory}/plugins"/> - </target> - <!-- - Steps to do before running the build.xmls for the elements being - built. - --> - <target - name="preProcess"> - <replace - dir="${buildDirectory}/plugins" - value="${timestamp}" - token="@build@"> - <include - name="**/about.mappings"/> - </replace> - </target> - <!-- - Steps to do after running the build.xmls for the elements being - built. - --> - <target - name="postProcess"> - <condition - property="logsAvailable"> - <istrue - value="${javacVerbose}"/> - </condition> - <antcall - target="gatherLogs"/> - </target> - - - <!-- - Steps to do before running assemble. - --> - <target - name="preAssemble"></target> - - <!-- - Steps to do after running assemble. - --> - <target - name="postAssemble"></target> - - <!-- - Steps to do after the build is done. - --> - <target - name="postBuild"></target> - - <!-- - Steps to do to test the build results - --> - <target - name="test"></target> - - <!-- - Steps to do to publish the build results - --> - <target - name="publish"></target> - - <!-- - Helper targets - --> - <target - name="gatherLogs" - if="logsAvailable"> - <mkdir - dir="${buildDirectory}/${buildLabel}/testcompilelogs"/> - <echo - level="debug" - message="logExtension: ${logExtension}"/> - <antcall - target="allElements"> - <param - name="target" - value="gatherLogs"/> - <param - name="logExtension" - value="${logExtension}"/> - </antcall> - <unzip - dest="${buildDirectory}/${buildLabel}/testcompilelogs" - overwrite="true"> - <fileset - dir="${buildDirectory}/features/org.eclipse.wtp.capabilities_tests.feature"> - <include - name="**/*.log.zip"/> - </fileset> - </unzip> - <!-- - TODO: it is unclear if the above "gather" and unzip do - anything constructive. I think not and should be removed - (after experimental run, of course. - --> - <!-- - workaround: see - https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070 - --> - <copy - todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins" - overwrite="true"> - <!-- - we want all @dot.xml files, but assumes a certain - structure, to include directory for name of plugin - --> - <fileset - dir="${buildDirectory}/features/"> - <include - name="**/feature.temp.folder/"/> - <exclude - name="**/*tests*feature*/feature.temp.folder/"/> - </fileset> - <compositemapper> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/@dot.xml" - to="/\2/@dot.xml"/> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/(.*)bin.xml" - to="/\2/\3bin.xml"/> - </compositemapper> - </copy> - </target> - <target - name="clean" - unless="noclean"> - <antcall - target="allElements"> - <param - name="target" - value="cleanElement"/> - </antcall> - </target> - - <!-- - Default target - --> - <target - name="noDefault"> - <echo - level="error" - message="You must specify a target when invoking this file"/> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpcap_tests/dependency.xml b/releng.wtpbuilder/components/wtpcap_tests/dependency.xml deleted file mode 100644 index 71a922e..0000000 --- a/releng.wtpbuilder/components/wtpcap_tests/dependency.xml +++ /dev/null
@@ -1,244 +0,0 @@ -<?xml version="1.0"?> - <!-- - ====================================================================== - Properties that must be passed to this script: base.install.dir - dependencyTargets local.cache.dir dependency.properties - ====================================================================== - --> -<project - name="test" - default="get"> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="debug" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <condition - property="getprereq.eclipse"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.eclipseplatform"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emf"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfxsd"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfvalidation"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.gef"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.jst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dltk"> - <istrue - value="false"/> - </condition> - <target - name="get"> - <!-- - read in this properties, just so we can make sure our - requested pre-reqs are defined, which we do later with - statements such if="${groupId}.url" - --> - <property - file="${dependency.properties}"/> - <antcall - target="prereq.eclipse"/> - <antcall - target="prereq.eclipseplatform"/> - <antcall - target="prereq.emf"/> - <antcall - target="prereq.emfxsd"/> - <antcall - target="prereq.emfvalidation"/> - <antcall - target="prereq.gef"/> - <antcall - target="prereq.dtp"/> - <antcall - target="prereq.wst"/> - <antcall - target="prereq.jst"/> - <antcall - target="prereq.wtp"/> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipseTestFramework"/> - </antcall> - </target> - <target - name="prereq.eclipse" - if="getprereq.eclipse"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipse"/> - </antcall> - </target> - <target - name="prereq.eclipseplatform" - if="getprereq.eclipseplatform"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipseplatform"/> - </antcall> - </target> - <target - name="prereq.emf" - if="getprereq.emf"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emf"/> - </antcall> - </target> - <target - name="prereq.emfxsd" - if="getprereq.emfxsd"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfxsd"/> - </antcall> - </target> - <target - name="prereq.emfvalidation" - if="getprereq.emfvalidation"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfvalidation"/> - </antcall> - </target> - <target - name="prereq.gef" - if="getprereq.gef"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="gef"/> - </antcall> - </target> - <target - name="prereq.dtp" - if="getprereq.dtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dtp"/> - </antcall> - </target> - <target - name="prereq.wst" - if="getprereq.wst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wst"/> - </antcall> - </target> - <target - name="prereq.jst" - if="getprereq.jst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="jst"/> - </antcall> - </target> - <target - name="prereq.wtp" - if="getprereq.wtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wtp"/> - </antcall> - </target> - <target - name="prereq.dltk" - if="getprereq.dltk"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dltk"/> - </antcall> - </target> - <target - name="getAndInstall" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}"/> - </ant> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpjee_sdk/build.properties b/releng.wtpbuilder/components/wtpjee_sdk/build.properties deleted file mode 100644 index 5bed879..0000000 --- a/releng.wtpbuilder/components/wtpjee_sdk/build.properties +++ /dev/null
@@ -1,47 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -# This property file is used automatically by the PDE build process - -runPackager=true - -# This is a subdirectory of $buildDirectory -# Set collectingFolder and archivePrefix to . if you want to create archives without -# trailing eclipse in the paths of the included files -collectingFolder=eclipse -logExtension=.xml -# The prefix that will be used in the generated archive. -# Does not make sense to use a different archivePrefix than collectingFolder, -# because zip wouldn't find any files to include into the target zip otherwise -archivePrefix=eclipse - -# Whether or not to include debug info in the output jars -javacDebugInfo=true - -# Whether or not to fail the build if there are compiler errors -javacFailOnError=false - -################################################## -# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when -# using the JDT Compiler Adapter to compile. -javacVerbose=true - -sign=true - -############################################################# - -# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See -# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html - -flattenDependencies=true -parallelCompilation=true - -
diff --git a/releng.wtpbuilder/components/wtpjee_sdk/customTargets.xml b/releng.wtpbuilder/components/wtpjee_sdk/customTargets.xml deleted file mode 100644 index 6b8e34a..0000000 --- a/releng.wtpbuilder/components/wtpjee_sdk/customTargets.xml +++ /dev/null
@@ -1,355 +0,0 @@ -<project - name="PDECustomTargets" - default="noDefault" - basedir="."> - <!-- - = = = standard properties pattern = = = Note to be - cross-platform, "environment variables" are only appropriate for - some variables, e.g. ones we set, since properties are case - sensitive, even if the environment variables on your operating - system are not, e.g. it will be ${env.Path} not ${env.PATH} on - Windows - --> - <property - environment="env"/> - <!-- - Let users override standard properties, if desired. If - directory, file, or some properties do not exist, then standard - properties will be used. - --> - <property - file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/> - - <!-- let this project specify properties, if not already set --> - <property - file="build.properties"/> - <fail - message="dependency.properties must be specified by distribution script" - unless="dependency.properties"/> - <fail - unless="buildDirectory" - message="buildDirectory must be set"/> - <echo - message="buildDirectory: ${buildDirectory}"/> - <!-- - Run a given ${target} on all elements being built Add on <ant> - task for each top level element being built. - --> - <target - name="allElements"> - <echo - level="info" - message="Target:${target} "/> - <echo - level="debug" - message="basedir: ${basedir}"/> - <echo - level="info" - message="component: ${component}"/> - <echo - level="debug" - message="buildDirectory: ${buildDirectory}"/> - <echo - level="debug" - message="baseLocation: ${baseLocation}"/> - <echo - level="debug" - message="generic target: ${genericTargets}"/> - <echo - message="compilerArg: ${compilerArg}"/> - <echo - message="individualSourceBundles: ${individualSourceBundles}"/> - <ant - antfile="${genericTargets}" - target="${target}"> - <property - name="type" - value="feature"/> - <property - name="id" - value="org.eclipse.wtp.jee_sdk.feature"/> - </ant> - </target> - <!-- - Targets to assemble the built elements for particular - configurations These generally call the generated assemble - scripts (named in ${assembleScriptName}) but may also add pre - and post processing Add one target for each root element and - each configuration - --> - <target - name="assemble.org.eclipse.wtp.jee_sdk.feature"> - <property - name="archiveName" - value="wtpjee-sdk-${buildLabel}.zip"/> - <ant - antfile="${assembleScriptName}" - dir="${buildDirectory}"/> - </target> - <target - name="prePackage"/> - <target - name="postPackage"> - <property - name="archiveName" - value="wtpjee-sdk-${buildLabel}.zip"/> - <ant - antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" - target="unpackUpdateJarsAndCreateZippedPackages"> - <property - name="buildDirectory" - value="${buildDirectory}"/> - <property - name="buildLabel" - value="${buildLabel}"/> - <property - name="archiveName" - value="${archiveName}"/> - </ant> - </target> - - <!-- - Check out map files from repository - --> - <target - name="getMapFiles"> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENG}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENG}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - </target> - - - <!-- - Steps to do before setup - --> - <target - name="preSetup"></target> - <!-- - Steps to do after setup but before starting the build proper - --> - <target - name="postSetup"> - <dirname - file="${ant.file}" - property="component.dir"/> - <echo - level="debug" - message="ant.file: ${ant.file}"/> - <echo - level="debug" - message="component.dir: ${component.dir}"/> - - <!-- Get the dependencies --> - <antcall - target="getDependencies"/> - </target> - <!-- - ===================================================================== - --> - <!-- Get the dependencies based on releng maps --> - <!-- - ===================================================================== - --> - <target - name="getDependencies"> - <ant - antfile="${component.dir}/dependency.xml" - target="get"> - <property - name="base.install.dir" - value="${buildRoot}"/> - </ant> - </target> - - <!-- - Steps to do before fetching the build elements - --> - <target - name="preFetch"></target> - - <!-- - Steps to do after fetching the build elements - --> - <target - name="postFetch"></target> - - <!-- - Steps to do before generating the build scripts. - --> - <target - name="preGenerate"></target> - - <!-- - Steps to do after generating the build scripts. - --> - <target - name="postGenerate"> - <echo - message="buildDirectory: ${buildDirectory}"/> - <customizeAccessRules - bundleDirectory="${buildDirectory}/plugins"/> - </target> - <!-- - Steps to do before running the build.xmls for the elements being - built. - --> - <target - name="preProcess"> - <replace - dir="${buildDirectory}/plugins" - value="${timestamp}" - token="@build@"> - <include - name="**/about.mappings"/> - </replace> - </target> - <!-- - Steps to do after running the build.xmls for the elements being - built. - --> - <target - name="postProcess"> - <condition - property="logsAvailable"> - <istrue - value="${javacVerbose}"/> - </condition> - <antcall - target="gatherLogs"/> - </target> - - - <!-- - Steps to do before running assemble. - --> - <target - name="preAssemble"></target> - - <!-- - Steps to do after running assemble. - --> - <target - name="postAssemble"></target> - - <!-- - Steps to do after the build is done. - --> - <target - name="postBuild"></target> - - <!-- - Steps to do to test the build results - --> - <target - name="test"></target> - - <!-- - Steps to do to publish the build results - --> - <target - name="publish"></target> - - <!-- - Helper targets - --> - <target - name="gatherLogs" - if="logsAvailable"> - <mkdir - dir="${buildDirectory}/${buildLabel}/compilelogs"/> - <echo - level="debug" - message="logExtension: ${logExtension}"/> - <antcall - target="allElements"> - <param - name="target" - value="gatherLogs"/> - <param - name="logExtension" - value="${logExtension}"/> - </antcall> - <unzip - dest="${buildDirectory}/${buildLabel}/compilelogs" - overwrite="true"> - <fileset - dir="${buildDirectory}/features/org.eclipse.wtp.jee_sdk.feature"> - <include - name="**/*.log.zip"/> - </fileset> - </unzip> - <!-- - TODO: it is unclear if the above "gather" and unzip do - anything constructive. I think not and should be removed - (after experimental run, of course. - --> - <!-- - workaround: see - https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070 - --> - <copy - todir="${buildDirectory}/${buildLabel}/compilelogs/plugins" - overwrite="true"> - <!-- - we want all @dot.xml files, but assumes a certain - structure, to include directory for name of plugin - --> - <fileset - dir="${buildDirectory}/features/"> - <include - name="**/feature.temp.folder/"/> - <exclude - name="**/*tests*feature*/feature.temp.folder/"/> - </fileset> - <compositemapper> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/@dot.xml" - to="/\2/@dot.xml"/> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/(.*)bin.xml" - to="/\2/\3bin.xml"/> - </compositemapper> - </copy> - </target> - <target - name="clean" - unless="noclean"> - <antcall - target="allElements"> - <param - name="target" - value="cleanElement"/> - </antcall> - </target> - - <!-- - Default target - --> - <target - name="noDefault"> - <echo - level="error" - message="You must specify a target when invoking this file"/> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpjee_sdk/dependency.xml b/releng.wtpbuilder/components/wtpjee_sdk/dependency.xml deleted file mode 100644 index 00b2f88..0000000 --- a/releng.wtpbuilder/components/wtpjee_sdk/dependency.xml +++ /dev/null
@@ -1,240 +0,0 @@ -<?xml version="1.0"?> - <!-- - ====================================================================== - Properties that must be passed to this script: base.install.dir - dependencyTargets local.cache.dir dependency.properties - ====================================================================== - --> -<project - name="test" - default="get"> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="debug" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <condition - property="getprereq.eclipse"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.eclipseplatform"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emf"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.emfxsd"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.emfvalidation"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.gef"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.dtp"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.wst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.jst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dltk"> - <istrue - value="false"/> - </condition> - <target - name="get"> - <!-- - read in this properties, just so we can make sure our - requested pre-reqs are defined, which we do later with - statements such if="${groupId}.url" - --> - <property - file="${dependency.properties}"/> - <antcall - target="prereq.eclipse"/> - <antcall - target="prereq.eclipseplatform"/> - <antcall - target="prereq.emf"/> - <antcall - target="prereq.emfxsd"/> - <antcall - target="prereq.emfvalidation"/> - <antcall - target="prereq.gef"/> - <antcall - target="prereq.dtp"/> - <antcall - target="prereq.wst"/> - <antcall - target="prereq.jst"/> - <antcall - target="prereq.wtp"/> - <antcall - target="prereq.dltk"/> - </target> - <target - name="prereq.eclipse" - if="getprereq.eclipse"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipse"/> - </antcall> - </target> - <target - name="prereq.eclipseplatform" - if="getprereq.eclipseplatform"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipseplatform"/> - </antcall> - </target> - <target - name="prereq.emf" - if="getprereq.emf"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emf"/> - </antcall> - </target> - <target - name="prereq.emfxsd" - if="getprereq.emfxsd"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfxsd"/> - </antcall> - </target> - <target - name="prereq.emfvalidation" - if="getprereq.emfvalidation"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfvalidation"/> - </antcall> - </target> - <target - name="prereq.gef" - if="getprereq.gef"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="gef"/> - </antcall> - </target> - <target - name="prereq.dtp" - if="getprereq.dtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dtp"/> - </antcall> - </target> - <target - name="prereq.wst" - if="getprereq.wst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wst"/> - </antcall> - </target> - <target - name="prereq.jst" - if="getprereq.jst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="jst"/> - </antcall> - </target> - <target - name="prereq.wtp" - if="getprereq.wtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wtp"/> - </antcall> - </target> - <target - name="prereq.dltk" - if="getprereq.dltk"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dltk"/> - </antcall> - </target> - <target - name="getAndInstall" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}"/> - </ant> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpjee_tests/build.properties b/releng.wtpbuilder/components/wtpjee_tests/build.properties deleted file mode 100644 index 4d26330..0000000 --- a/releng.wtpbuilder/components/wtpjee_tests/build.properties +++ /dev/null
@@ -1,46 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -# This property file is used automatically by the PDE build process - -runPackager=true - -# This is a subdirectory of $buildDirectory -# Set collectingFolder and archivePrefix to . if you want to create archives without -# trailing eclipse in the paths of the included files -collectingFolder=eclipse -logExtension=.xml -# The prefix that will be used in the generated archive. -# Does not make sense to use a different archivePrefix than collectingFolder, -# because zip wouldn't find any files to include into the target zip otherwise -archivePrefix=eclipse - -# Whether or not to include debug info in the output jars -javacDebugInfo=true - -# Whether or not to fail the build if there are compiler errors -javacFailOnError=false - -################################################## -# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when -# using the JDT Compiler Adapter to compile. -javacVerbose=true - -sign=false - -############################################################# - -# Properties introduced in 3.5 M3 (PDE base builder R35_M2). See -# http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html - -flattenDependencies=true -parallelCompilation=true -
diff --git a/releng.wtpbuilder/components/wtpjee_tests/customTargets.xml b/releng.wtpbuilder/components/wtpjee_tests/customTargets.xml deleted file mode 100644 index 8a12c5c..0000000 --- a/releng.wtpbuilder/components/wtpjee_tests/customTargets.xml +++ /dev/null
@@ -1,355 +0,0 @@ -<project - name="PDECustomTargets" - default="noDefault" - basedir="."> - <!-- - = = = standard properties pattern = = = Note to be - cross-platform, "environment variables" are only appropriate for - some variables, e.g. ones we set, since properties are case - sensitive, even if the environment variables on your operating - system are not, e.g. it will be ${env.Path} not ${env.PATH} on - Windows - --> - <property - environment="env"/> - <!-- - Let users override standard properties, if desired. If - directory, file, or some properties do not exist, then standard - properties will be used. - --> - <property - file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/> - - <!-- let this project specify properties, if not already set --> - <property - file="build.properties"/> - <fail - message="dependency.properties must be specified by distribution script" - unless="dependency.properties"/> - <fail - unless="buildDirectory" - message="buildDirectory must be set"/> - <echo - message="buildDirectory: ${buildDirectory}"/> - <!-- - Run a given ${target} on all elements being built Add on <ant> - task for each top level element being built. - --> - <target - name="allElements"> - <echo - level="info" - message="Target:${target} "/> - <echo - level="debug" - message="basedir: ${basedir}"/> - <echo - level="info" - message="component: ${component}"/> - <echo - level="debug" - message="buildDirectory: ${buildDirectory}"/> - <echo - level="debug" - message="baseLocation: ${baseLocation}"/> - <echo - level="debug" - message="generic target: ${genericTargets}"/> - <echo - message="compilerArg: ${compilerArg}"/> - <echo - message="individualSourceBundles: ${individualSourceBundles}"/> - <ant - antfile="${genericTargets}" - target="${target}"> - <property - name="type" - value="feature"/> - <property - name="id" - value="org.eclipse.wtp.jee_tests.feature"/> - </ant> - </target> - <!-- - Targets to assemble the built elements for particular - configurations These generally call the generated assemble - scripts (named in ${assembleScriptName}) but may also add pre - and post processing Add one target for each root element and - each configuration - --> - <target - name="assemble.org.eclipse.wtp.jee_tests.feature"> - <property - name="archiveName" - value="wtpjee-tests-${buildLabel}.zip"/> - <ant - antfile="${assembleScriptName}" - dir="${buildDirectory}"/> - </target> - <target - name="prePackage"/> - <target - name="postPackage"> - <property - name="archiveName" - value="wtpjee-tests-${buildLabel}.zip"/> - <ant - antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" - target="unpackUpdateJarsAndCreateZippedPackages"> - <property - name="buildDirectory" - value="${buildDirectory}"/> - <property - name="buildLabel" - value="${buildLabel}"/> - <property - name="archiveName" - value="${archiveName}"/> - </ant> - </target> - - <!-- - Check out map files from repository - --> - <target - name="getMapFiles"> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENG}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - <ant - antfile="${wtp.builder.home}/scripts/build/maptasks.xml" - target="maputil"> - <property - name="mapcomponent" - value="${env.RELENG}"/> - <property - name="mapTag" - value="${mapVersionTag}"/> - </ant> - </target> - - - <!-- - Steps to do before setup - --> - <target - name="preSetup"></target> - <!-- - Steps to do after setup but before starting the build proper - --> - <target - name="postSetup"> - <dirname - file="${ant.file}" - property="component.dir"/> - <echo - level="debug" - message="ant.file: ${ant.file}"/> - <echo - level="debug" - message="component.dir: ${component.dir}"/> - - <!-- Get the dependencies --> - <antcall - target="getDependencies"/> - </target> - <!-- - ===================================================================== - --> - <!-- Get the dependencies based on releng maps --> - <!-- - ===================================================================== - --> - <target - name="getDependencies"> - <ant - antfile="${component.dir}/dependency.xml" - target="get"> - <property - name="base.install.dir" - value="${buildRoot}"/> - </ant> - </target> - - <!-- - Steps to do before fetching the build elements - --> - <target - name="preFetch"></target> - - <!-- - Steps to do after fetching the build elements - --> - <target - name="postFetch"></target> - - <!-- - Steps to do before generating the build scripts. - --> - <target - name="preGenerate"></target> - - <!-- - Steps to do after generating the build scripts. - --> - <target - name="postGenerate"> - <echo - message="buildDirectory: ${buildDirectory}"/> - <customizeAccessRules - bundleDirectory="${buildDirectory}/plugins"/> - </target> - <!-- - Steps to do before running the build.xmls for the elements being - built. - --> - <target - name="preProcess"> - <replace - dir="${buildDirectory}/plugins" - value="${timestamp}" - token="@build@"> - <include - name="**/about.mappings"/> - </replace> - </target> - <!-- - Steps to do after running the build.xmls for the elements being - built. - --> - <target - name="postProcess"> - <condition - property="logsAvailable"> - <istrue - value="${javacVerbose}"/> - </condition> - <antcall - target="gatherLogs"/> - </target> - - - <!-- - Steps to do before running assemble. - --> - <target - name="preAssemble"></target> - - <!-- - Steps to do after running assemble. - --> - <target - name="postAssemble"></target> - - <!-- - Steps to do after the build is done. - --> - <target - name="postBuild"></target> - - <!-- - Steps to do to test the build results - --> - <target - name="test"></target> - - <!-- - Steps to do to publish the build results - --> - <target - name="publish"></target> - - <!-- - Helper targets - --> - <target - name="gatherLogs" - if="logsAvailable"> - <mkdir - dir="${buildDirectory}/${buildLabel}/testcompilelogs"/> - <echo - level="debug" - message="logExtension: ${logExtension}"/> - <antcall - target="allElements"> - <param - name="target" - value="gatherLogs"/> - <param - name="logExtension" - value="${logExtension}"/> - </antcall> - <unzip - dest="${buildDirectory}/${buildLabel}/testcompilelogs" - overwrite="true"> - <fileset - dir="${buildDirectory}/features/org.eclipse.wtp.jee_tests.feature"> - <include - name="**/*.log.zip"/> - </fileset> - </unzip> - <!-- - TODO: it is unclear if the above "gather" and unzip do - anything constructive. I think not and should be removed - (after experimental run, of course. - --> - <!-- - workaround: see - https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and - https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070 - --> - <copy - todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins" - overwrite="true"> - <!-- - we want all @dot.xml files, but assumes a certain - structure, to include directory for name of plugin - --> - <fileset - dir="${buildDirectory}/features/"> - <include - name="**/feature.temp.folder/"/> - <exclude - name="**/*tests*feature*/feature.temp.folder/"/> - </fileset> - <compositemapper> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/@dot.xml" - to="/\2/@dot.xml"/> - <mapper - type="regexp" - from="(.*)/plugins/(.*)/(.*)bin.xml" - to="/\2/\3bin.xml"/> - </compositemapper> - </copy> - </target> - <target - name="clean" - unless="noclean"> - <antcall - target="allElements"> - <param - name="target" - value="cleanElement"/> - </antcall> - </target> - - <!-- - Default target - --> - <target - name="noDefault"> - <echo - level="error" - message="You must specify a target when invoking this file"/> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtpjee_tests/dependency.xml b/releng.wtpbuilder/components/wtpjee_tests/dependency.xml deleted file mode 100644 index 8d0c341..0000000 --- a/releng.wtpbuilder/components/wtpjee_tests/dependency.xml +++ /dev/null
@@ -1,244 +0,0 @@ -<?xml version="1.0"?> - <!-- - ====================================================================== - Properties that must be passed to this script: base.install.dir - dependencyTargets local.cache.dir dependency.properties - ====================================================================== - --> -<project - name="test" - default="get"> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="debug" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <condition - property="getprereq.eclipse"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.eclipseplatform"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emf"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.emfxsd"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.emfvalidation"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.gef"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.dtp"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.wst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.jst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dltk"> - <istrue - value="false"/> - </condition> - <target - name="get"> - <!-- - read in this properties, just so we can make sure our - requested pre-reqs are defined, which we do later with - statements such if="${groupId}.url" - --> - <property - file="${dependency.properties}"/> - <antcall - target="prereq.eclipse"/> - <antcall - target="prereq.eclipseplatform"/> - <antcall - target="prereq.emf"/> - <antcall - target="prereq.emfxsd"/> - <antcall - target="prereq.emfvalidation"/> - <antcall - target="prereq.gef"/> - <antcall - target="prereq.dtp"/> - <antcall - target="prereq.wst"/> - <antcall - target="prereq.jst"/> - <antcall - target="prereq.wtp"/> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipseTestFramework"/> - </antcall> - </target> - <target - name="prereq.eclipse" - if="getprereq.eclipse"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipse"/> - </antcall> - </target> - <target - name="prereq.eclipseplatform" - if="getprereq.eclipseplatform"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="eclipseplatform"/> - </antcall> - </target> - <target - name="prereq.emf" - if="getprereq.emf"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emf"/> - </antcall> - </target> - <target - name="prereq.emfxsd" - if="getprereq.emfxsd"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfxsd"/> - </antcall> - </target> - <target - name="prereq.emfvalidation" - if="getprereq.emfvalidation"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="emfvalidation"/> - </antcall> - </target> - <target - name="prereq.gef" - if="getprereq.gef"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="gef"/> - </antcall> - </target> - <target - name="prereq.dtp" - if="getprereq.dtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dtp"/> - </antcall> - </target> - <target - name="prereq.wst" - if="getprereq.wst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wst"/> - </antcall> - </target> - <target - name="prereq.jst" - if="getprereq.jst"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="jst"/> - </antcall> - </target> - <target - name="prereq.wtp" - if="getprereq.wtp"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="wtp"/> - </antcall> - </target> - <target - name="prereq.dltk" - if="getprereq.dltk"> - <antcall - target="getAndInstall"> - <param - name="groupId" - value="dltk"/> - </antcall> - </target> - <target - name="getAndInstall" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}"/> - </ant> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.tests/build.xml b/releng.wtpbuilder/distribution/wstfproj.tests/build.xml deleted file mode 100644 index 6cf1b5f..0000000 --- a/releng.wtpbuilder/distribution/wstfproj.tests/build.xml +++ /dev/null
@@ -1,357 +0,0 @@ -<project - name="Build specific targets and properties" - default="runTest"> - <!-- - Note to be cross-platform, "environment variables" are only - appropriate for some variables, e.g. ones we set, since - properties are case sensitive, even if the environment variables - on your operating system are not, e.g. it will be ${env.Path} - not ${env.PATH} on Windows - --> - <property - environment="env"/> - <fail - message="testRoot must be set for this task" - unless="testRoot"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - - - <!-- - typcially already set, but in case of standalone tests, may not - be - --> - <property - name="buildLabel" - value="${buildType}-${buildId}-${timestamp}"/> - - - <!-- - Steps to do after the build is done. - --> - <target - name="test"> - <dirname - file="${ant.file}" - property="currentDirectory"/> - <ant - antfile="${ant.file}" - target="runTest" - dir="${currentDirectory}"/> - </target> - - <!-- - Steps to do to test the build results - --> - <target - name="runTest"> - <dirname - file="${ant.file}" - property="test.component.dir"/> - <ant - antfile="${wtp.builder.home}/scripts/build/label.xml"/> - <property - file="${buildDirectory}/label.properties"/> - <property - file="${wtp.builder.home}/build.properties"/> - <fail - message="testRoot must be set for this task" - unless="testRoot"/> - <mkdir - dir="${testRoot}"/> - - <!-- if results already exist, delete them --> - <delete - dir="${testRoot}/results" - failOnError="false"/> - <mkdir - dir="${testRoot}/results"/> - <mkdir - dir="${testRoot}/results/consolelogs"/> - <copy - todir="${testRoot}" - overwrite="true"> - <fileset - dir="${test.component.dir}/testScripts"/> - </copy> - <echo - message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/> - <!-- - for this distribution, dependencies come from releng. Assume - no subdirectory, if not otherwise set (bug 285383). - --> - <property - name="env.DEP_DIR" - value=""/> - <property - name="dependency.properties" - value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/> - <available - file="${dependency.properties}" - property="dependency.properties.exists"/> - <fail - message="dependency file not found: ${dependency.properties}" - unless="dependency.properties.exists"/> - <ant - antfile="${test.component.dir}/testdependency.xml" - target="get"> - <property - name="base.install.dir" - value="${testRoot}"/> - </ant> - <antcall - target="unzipTests"/> - <antcall - target="runTestEclipse"> - <param - name="testTarget" - value="all"/> - </antcall> - <antcall - target="postRunTestEclipse"> - <param - name="testTarget" - value="all"/> - </antcall> - </target> - <target - name="unzipTests"> - <!-- - unzip the builds and junit tests we use 'unzip' here, so we - can continue on error, if desired. (such as if zip was not - created, due to other failures or options). - --> - <exec - dir="${buildDirectory}/${buildLabel}" - executable="unzip" - failonerror="true"> - <arg - line="-o -qq wst-common-fproj-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/> - </exec> - <exec - dir="${buildDirectory}/${buildLabel}" - executable="unzip" - failonerror="true"> - <arg - line="-o -qq wst-common-fproj-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/> - </exec> - </target> - <!-- - time out may need to be set/adjust for api or performance tests? - This testTimeLimit is the whole, overall limit on tests. There's - a shorter one for individual suites. 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="testTimeLimit" - value="1800000"/> - <property - name="testFailOnError" - value="false"/> - <target - name="runTestEclipse" - description="Run our JUnit's within an instance of antRunner"> - <property - name="test-vm" - value="${env.JAVA_6_HOME}/bin/java"/> - - <!-- - set path to eclipse folder. If local folder, use '.'; - otherwise, use c:\path\to\eclipse or /path/to/eclipse/ - --> - <property - name="eclipse.home" - value="${testRoot}"/> - <echo - message="testTarget: ${testTarget}"/> - <!-- - can not pass in empty values in jvmargs so if not testBundle - specified, we'll pass a junk (unused) value - --> - <condition - property="testBundleParam" - value="-DtestBundle=${testBundle}" - else="-Dunused=nouse"> - <isset - property="testBundle"/> - </condition> - <echo - message="Running junits"/> - <!-- - If there is not exactly one launcher in the stack, we'd best - fail fast, since we are not expecting that, and may indicate - an installation that would produce unpredictable results - --> - <!-- - requires ant 1.7, and at this point, we're running 1.6 from - eclipse ... <condition property="expectedNumberOfLaunchers"> - <resourcecount when="equal" count="1" > <fileset - dir="${testRoot}/eclipse/plugins"> <include - name="org.eclipse.equinox.launcher_*.jar" /> </fileset> - </resourcecount> </condition> <fail message="Did not find - expected number of launcher jars. Check installation." - unless="expectedNumberOfLaunchers" /> - --> - <!-- - Remember: using dash 'debug' for org.eclipse.ant.core.antRunner - produces ant debug info to be output ... which is a TON of - stuff. Even 'verbose' is a bit too much. - --> - <echo - message="eclipse.launcher: ${eclipse.launcher}"/> - <java - taskname="unit-test-masterprocess" - fork="true" - resultProperty="wtpmasterjunitresult" - failonerror="false" - timeout="${testTimeLimit}" - dir="${testRoot}/eclipse" - jvm="${env.JAVA_6_HOME}/bin/java" - classname="org.eclipse.equinox.launcher.Main"> - <classpath> - <fileset - dir="${testRoot}/eclipse/plugins"> - <include - name="org.eclipse.equinox.launcher_*.jar"/> - </fileset> - </classpath> - <jvmarg - value="-Dosgi.ws=${env.BASEWS}"/> - <jvmarg - value="-Dosgi.os=${env.BASEOS}"/> - <jvmarg - value="-Dosgi.arch=${env.BASEARCH}"/> - <jvmarg - value="-Dws=${env.BASEWS}"/> - <jvmarg - value="-Dos=${env.BASEOS}"/> - <jvmarg - value="-Darch=${env.BASEARCH}"/> - <jvmarg - value="-DbuildBranch=${buildBranch}"/> - <jvmarg - value="-DbuildType=${buildType}"/> - <jvmarg - value="-DbuildId=${buildId}"/> - <jvmarg - value="-Dprojectname=${projectname}"/> - <jvmarg - value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/> - <jvmarg - value="${testBundleParam}"/> - <arg - value="-nosplash"/> - <arg - value="-consolelog"/> - <arg - value="-data"/> - <arg - value="${testRoot}/overallTestWorkspace"/> - <arg - value="-application"/> - <arg - value="org.eclipse.ant.core.antRunner"/> - <arg - value="-logger"/> - <arg - value="org.apache.tools.ant.DefaultLogger"/> - <arg - value="-file"/> - <arg - value="${testRoot}/test.xml"/> - <arg - value="${testTarget}"/> - - <!-- make sure our forked env has a DISPLAY --> - <env - key="DISPLAY" - value="${env.DISPLAY}"/> - <redirector - output="${testRoot}/results/fullOutput.txt" - error="${testRoot}/results/fullErrorLog.txt"/> - <jvmarg - value="-Dbuild.home=${env.BUILD_HOME}"/> - <jvmarg - value="-DbuildDirectory=${buildDirectory}"/> - <jvmarg - value="-DbuildLabel=${buildLabel}"/> - <jvmarg - value="-DbaseLocation=${baseLocation}"/> - <jvmarg - value="-DtestRoot=${testRoot}"/> - <jvmarg - value="-DtestDir=${testRoot}"/> - <jvmarg - value="-DeclipseBuilderDirectory=${pde.builder.path}"/> - </java> - <echo - message="wtpmasterjunitresult ${wtpmasterjunitresult}"/> - </target> - <target - name="postRunTestEclipse"> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results"> - <include - name="*output.txt"/> - </fileset> - </copy> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results"> - <include - name="*error.txt"/> - </fileset> - </copy> - <copy - file="${testRoot}/results/fullOutput.txt" - toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full" - overwrite="true" - failonerror="false"> - </copy> - <copy - file="${testRoot}/results/fullErrorLog.txt" - toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full" - overwrite="true" - failonerror="false"> - </copy> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/xml" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results/xml"> - <include - name="*.xml"/> - </fileset> - </copy> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/html" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results/html"> - <include - name="*.html"/> - </fileset> - </copy> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/wstfproj.tests/templateFiles/index.php deleted file mode 100644 index a42c883..0000000 --- a/releng.wtpbuilder/distribution/wstfproj.tests/templateFiles/index.php +++ /dev/null
@@ -1,85 +0,0 @@ -<html> -<head> - -<?php -$parts = explode("/", realpath("..")); -$label = $parts[count($parts) - 1]; -?> - -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" - type="text/css"> -</head> -<body> -<p><b><font face="Verdana" size="+3">Test Results</font></b></p> -<table border=0 cellspacing=5 cellpadding=2 width="100%"> - <tr> - <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font - color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?> - </font></b></td> - </tr> -</table> -<p></p> -<table border="0"> -</table> - -<table width="77%" border="1"> - <tr> - <td width="81%"><b>Tests Performed</b></td> - <td width="19%"><b>Errors & Failures</b></td> - </tr> - - <? - $dir = dir("html"); - while ($anEntry = $dir->read()) - { - if ($anEntry != "." && $anEntry != "..") - { - $link = "html/".$anEntry; - $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml"; - $count = 0; - $fileHandle = fopen($xml, "r"); - while (!feof($fileHandle)) - { - $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0 - $count = $count + substr_count($aLine, '<error'); - } - fclose($fileHandle); - if ($count > 0) - { - echo "<tr><td><a href=\"$link\"><b><font color=\"red\">"; - echo "$anEntry"; - echo "</font></b></a></td>"; - echo "<td><b><font color=\"red\">$count</font></b></td></tr>"; - } - else - { - echo "<tr><td><a href=\"$link\">"; - echo "$anEntry"; - echo "</a></td>"; - echo "<td>$count</td></tr>"; - } - } - } - ?> - -</table> -<p></p> -<br> -<table border=0 cellspacing=5 cellpadding=2 width="100%"> - <tr> - <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font - color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?> - </font></b></td> - </tr> -</table> -<br> -These -<a href="consolelogs/wtptestlog.txt">logs</a> -contain the console output captured while running the JUnit automated -tests. -<br> -<br> - -</body> -</html>
diff --git a/releng.wtpbuilder/distribution/wstfproj.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/wstfproj.tests/testScripts/JUNIT.XSL deleted file mode 100644 index 9cdd80e..0000000 --- a/releng.wtpbuilder/distribution/wstfproj.tests/testScripts/JUNIT.XSL +++ /dev/null
@@ -1,703 +0,0 @@ -<xsl:stylesheet - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - <xsl:output - method="html" - indent="yes"/> - <xsl:decimal-format - decimal-separator="." - grouping-separator=","/> - <xsl:template - match="testsuites"> - <HTML> - <HEAD> - <style - type="text/css"> body { font:normal 68% - verdana,arial,helvetica; color:#000000; } table tr - td, table tr th { font-size: 68%; } table.details tr - th{ font-weight: bold; text-align:left; - background:#a6caf0; } table.details tr td{ - background:#eeeee0; } p { line-height:1.5em; - margin-top:0.5em; margin-bottom:1.0em; } h1 { - margin: 0px 0px 5px; font: 165% - verdana,arial,helvetica } h2 { margin-top: 1em; - margin-bottom: 0.5em; font: bold 125% - verdana,arial,helvetica } h3 { margin-bottom: 0.5em; - font: bold 115% verdana,arial,helvetica } h4 { - margin-bottom: 0.5em; font: bold 100% - verdana,arial,helvetica } h5 { margin-bottom: 0.5em; - font: bold 100% verdana,arial,helvetica } h6 { - margin-bottom: 0.5em; font: bold 100% - verdana,arial,helvetica } .Error { font-weight:bold; - color:red; } .Failure { font-weight:bold; - color:purple; } .Properties { text-align:right; } </style> - <script - language="JavaScript"> - var TestCases = new Array(); var cur; - <xsl:for-each - select="./testsuite"> - <xsl:apply-templates - select="properties"/> - </xsl:for-each> - </script> - <script - language="JavaScript"><![CDATA[ - function displayProperties (name) { - var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); - var doc = win.document.open(); - doc.write("<html><head><title>Properties of " + name + "</title>"); - doc.write("<style>") - doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); - doc.write("table tr td, table tr th { font-size: 68%; }"); - doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); - doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); - doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); - doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); - doc.write("</style>"); - doc.write("</head><body>"); - doc.write("<h3>Properties of " + name + "</h3>"); - doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); - doc.write("<table class='properties'>"); - doc.write("<tr><th>Name</th><th>Value</th></tr>"); - for (prop in TestCases[name]) { - doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); - } - doc.write("</table>"); - doc.write("</body></html>"); - doc.close(); - win.focus(); - } - ]]> - </script> - </HEAD> - <body> - <a - name="top"></a> - <xsl:call-template - name="pageHeader"/> - - <!-- Summary part --> - <xsl:call-template - name="summary"/> - <hr - size="1" - width="95%" - align="left"/> - - <!-- Package List part --> - <xsl:call-template - name="packagelist"/> - <hr - size="1" - width="95%" - align="left"/> - - <!-- For each package create its part --> - <xsl:call-template - name="packages"/> - <hr - size="1" - width="95%" - align="left"/> - - <!-- For each class create the part --> - <xsl:call-template - name="classes"/> - </body> - </HTML> - </xsl:template> - <!-- - ================================================================== - --> - <!-- - Write a list of all packages with an hyperlink to the anchor of - --> - <!-- - of the package name. - --> - <!-- - ================================================================== - --> - <xsl:template - name="packagelist"> - <h2>Packages</h2> - Note: package statistics are not computed recursively, they only - sum up all of its testsuites numbers. - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <xsl:call-template - name="testsuite.test.header"/> - <!-- list all packages recursively --> - <xsl:for-each - select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> - <xsl:sort - select="@package"/> - <xsl:variable - name="testsuites-in-package" - select="/testsuites/testsuite[./@package = current()/@package]"/> - <xsl:variable - name="testCount" - select="sum($testsuites-in-package/@tests)"/> - <xsl:variable - name="errorCount" - select="sum($testsuites-in-package/@errors)"/> - <xsl:variable - name="failureCount" - select="sum($testsuites-in-package/@failures)"/> - <xsl:variable - name="timeCount" - select="sum($testsuites-in-package/@time)"/> - - <!-- write a summary for the package --> - <tr - valign="top"> - <!-- set a nice color depending if there is an error/failure --> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="$failureCount > 0">Failure</xsl:when> - <xsl:when - test="$errorCount > 0">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - <td> - <a - href="#{@package}"> - <xsl:value-of - select="@package"/> - </a> - </td> - <td> - <xsl:value-of - select="$testCount"/> - </td> - <td> - <xsl:value-of - select="$errorCount"/> - </td> - <td> - <xsl:value-of - select="$failureCount"/> - </td> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="$timeCount"/> - </xsl:call-template> - </td> - </tr> - </xsl:for-each> - </table> - </xsl:template> - <!-- - ================================================================== - --> - <!-- - Write a package level report - --> - <!-- - It creates a table with values from the document: - --> - <!-- - Name | Tests | Errors | Failures | Time - --> - <!-- - ================================================================== - --> - <xsl:template - name="packages"> - <!-- create an anchor to this package name --> - <xsl:for-each - select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> - <xsl:sort - select="@package"/> - <a - name="{@package}"></a> - <h3> - Package - <xsl:value-of - select="@package"/> - </h3> - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <xsl:call-template - name="testsuite.test.header"/> - - <!-- match the testsuites of this package --> - <xsl:apply-templates - select="/testsuites/testsuite[./@package = current()/@package]" - mode="print.test"/> - </table> - <a - href="#top">Back to top</a> - <p/> - <p/> - </xsl:for-each> - </xsl:template> - <xsl:template - name="classes"> - <xsl:for-each - select="testsuite"> - <xsl:sort - select="@name"/> - <!-- create an anchor to this class name --> - <a - name="{@name}"></a> - <h3> - TestCase - <xsl:value-of - select="@name"/> - </h3> - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <xsl:call-template - name="testcase.test.header"/> - <!-- - test can even not be started at all (failure to load - the class) so report the error directly - --> - <xsl:if - test="./error"> - <tr - class="Error"> - <td - colspan="4"> - <xsl:apply-templates - select="./error"/> - </td> - </tr> - </xsl:if> - <xsl:apply-templates - select="./testcase" - mode="print.test"/> - </table> - <div - class="Properties"> - <a> - <xsl:attribute - name="href">javascript:displayProperties('<xsl:value-of - select="@package"/>.<xsl:value-of - select="@name"/>');</xsl:attribute> - Properties >> - </a> - </div> - <p/> - <a - href="#top">Back to top</a> - </xsl:for-each> - </xsl:template> - <xsl:template - name="summary"> - <h2>Summary</h2> - <xsl:variable - name="testCount" - select="sum(testsuite/@tests)"/> - <xsl:variable - name="errorCount" - select="sum(testsuite/@errors)"/> - <xsl:variable - name="failureCount" - select="sum(testsuite/@failures)"/> - <xsl:variable - name="timeCount" - select="sum(testsuite/@time)"/> - <xsl:variable - name="successRate" - select="($testCount - $failureCount - $errorCount) div $testCount"/> - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <tr - valign="top"> - <th>Tests</th> - <th>Failures</th> - <th>Errors</th> - <th>Success rate</th> - <th>Time</th> - </tr> - <tr - valign="top"> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="$failureCount > 0">Failure</xsl:when> - <xsl:when - test="$errorCount > 0">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - <td> - <xsl:value-of - select="$testCount"/> - </td> - <td> - <xsl:value-of - select="$failureCount"/> - </td> - <td> - <xsl:value-of - select="$errorCount"/> - </td> - <td> - <xsl:call-template - name="display-percent"> - <xsl:with-param - name="value" - select="$successRate"/> - </xsl:call-template> - </td> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="$timeCount"/> - </xsl:call-template> - </td> - </tr> - </table> - <table - border="0" - width="95%"> - <tr> - <td - style="text-align: justify;"> - Note: - <i>failures</i> - are anticipated and checked for with assertions - while - <i>errors</i> - are unanticipated. - </td> - </tr> - </table> - </xsl:template> - <!-- - Write properties into a JavaScript data structure. This is based - on the original idea by Erik Hatcher (erik@hatcher.net) - --> - <xsl:template - match="properties"> - cur = TestCases[' - <xsl:value-of - select="../@package"/> - . - <xsl:value-of - select="../@name"/> - '] = new Array(); - <xsl:for-each - select="property"> - <xsl:sort - select="@name"/> - cur[' - <xsl:value-of - select="@name"/> - '] = ' - <xsl:call-template - name="JS-escape"> - <xsl:with-param - name="string" - select="@value"/> - </xsl:call-template> - '; - </xsl:for-each> - </xsl:template> - - <!-- Page HEADER --> - <xsl:template - name="pageHeader"> - <h1>Unit Test Results</h1> - <table - width="100%"> - <tr> - <td - align="left"></td> - <td - align="right"> - Designed for use with - <a - href='http://www.junit.org'>JUnit</a> - and - <a - href='http://jakarta.apache.org/ant'>Ant</a> - . - </td> - </tr> - </table> - <hr - size="1"/> - </xsl:template> - <xsl:template - match="testsuite" - mode="header"> - <tr - valign="top"> - <th - width="80%">Name</th> - <th>Tests</th> - <th>Errors</th> - <th>Failures</th> - <th - nowrap="nowrap">Time(s)</th> - </tr> - </xsl:template> - - <!-- class header --> - <xsl:template - name="testsuite.test.header"> - <tr - valign="top"> - <th - width="80%">Name</th> - <th>Tests</th> - <th>Errors</th> - <th>Failures</th> - <th - nowrap="nowrap">Time(s)</th> - </tr> - </xsl:template> - - <!-- method header --> - <xsl:template - name="testcase.test.header"> - <tr - valign="top"> - <th>Name</th> - <th>Status</th> - <th - width="80%">Type</th> - <th - nowrap="nowrap">Time(s)</th> - </tr> - </xsl:template> - - - <!-- class information --> - <xsl:template - match="testsuite" - mode="print.test"> - <tr - valign="top"> - <!-- set a nice color depending if there is an error/failure --> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="@failures[.> 0]">Failure</xsl:when> - <xsl:when - test="@errors[.> 0]">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - - <!-- print testsuite information --> - <td> - <a - href="#{@name}"> - <xsl:value-of - select="@name"/> - </a> - </td> - <td> - <xsl:value-of - select="@tests"/> - </td> - <td> - <xsl:value-of - select="@errors"/> - </td> - <td> - <xsl:value-of - select="@failures"/> - </td> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="@time"/> - </xsl:call-template> - </td> - </tr> - </xsl:template> - <xsl:template - match="testcase" - mode="print.test"> - <tr - valign="top"> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="failure | error">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - <td> - <xsl:value-of - select="@name"/> - </td> - <xsl:choose> - <xsl:when - test="failure"> - <td>Failure</td> - <td> - <xsl:apply-templates - select="failure"/> - </td> - </xsl:when> - <xsl:when - test="error"> - <td>Error</td> - <td> - <xsl:apply-templates - select="error"/> - </td> - </xsl:when> - <xsl:otherwise> - <td>Success</td> - <td></td> - </xsl:otherwise> - </xsl:choose> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="@time"/> - </xsl:call-template> - </td> - </tr> - </xsl:template> - <xsl:template - match="failure"> - <xsl:call-template - name="display-failures"/> - </xsl:template> - <xsl:template - match="error"> - <xsl:call-template - name="display-failures"/> - </xsl:template> - - <!-- Style for the error and failure in the tescase template --> - <xsl:template - name="display-failures"> - <xsl:choose> - <xsl:when - test="not(@message)"> - N/A - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="@message"/> - </xsl:otherwise> - </xsl:choose> - <!-- display the stacktrace --> - <code> - <p/> - <xsl:call-template - name="br-replace"> - <xsl:with-param - name="word" - select="."/> - </xsl:call-template> - </code> - <!-- - the later is better but might be problematic for non-21" - monitors... - --> - <!--pre><xsl:value-of select="."/></pre--> - </xsl:template> - <xsl:template - name="JS-escape"> - <xsl:param - name="string"/> - <xsl:choose> - <!-- - something isn't right here, basically all single quotes - need to be replaced with backslash-single-quote - <xsl:when test="contains($string,''')"> - <xsl:value-of - select="substring-before($string,''')"/> \' - <xsl:call-template name="JS-escape"> <xsl:with-param - name="string" - select="substring-after($string,''')"/> - </xsl:call-template> </xsl:when> - --> - <xsl:when - test="contains($string,'\')"> - <xsl:value-of - select="substring-before($string,'\')"/> - \\ - <xsl:call-template - name="JS-escape"> - <xsl:with-param - name="string" - select="substring-after($string,'\')"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$string"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - <!-- - template that will convert a carriage return into a br tag - @param word the text from which to convert CR to BR tag - --> - <xsl:template - name="br-replace"> - <xsl:param - name="word"/> - <xsl:choose> - <xsl:when - test="contains($word,'
')"> - <xsl:value-of - select="substring-before($word,'
')"/> - <br/> - <xsl:call-template - name="br-replace"> - <xsl:with-param - name="word" - select="substring-after($word,'
')"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$word"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - <xsl:template - name="display-time"> - <xsl:param - name="value"/> - <xsl:value-of - select="format-number($value,'0.000')"/> - </xsl:template> - <xsl:template - name="display-percent"> - <xsl:param - name="value"/> - <xsl:value-of - select="format-number($value,'0.00%')"/> - </xsl:template> -</xsl:stylesheet> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wstfproj.tests/testScripts/test.xml deleted file mode 100644 index e3b5f65..0000000 --- a/releng.wtpbuilder/distribution/wstfproj.tests/testScripts/test.xml +++ /dev/null
@@ -1,104 +0,0 @@ -<project - name="Automated Eclipse Testing" - default="all" - basedir="."> - <property - environment="env"/> - - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <echo - level="info" - message="starting Automated Eclipse Testing"/> - <echo - level="info" - message="ant file basedir: ${basedir}"/> - <echo - level="info" - message="testRoot: ${testRoot}"/> - <fail - message="testRoot must be set" - unless="testRoot"/> - - <!--properties file containing the build information--> - <property - file="${buildDirectory}/label.properties"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - - <!-- - name that can be added to report name to identify which platform - tests results come from - --> - <property - name="platform" - value=""/> - - <!-- TODO: The framework apps might need this. But we should elmimnate if posslbe. --> - <property - name="eclipse-home" - value="${testRoot}"/> - <!-- - The directory that will contain the xml and html results from - the tests that are run - --> - <property - name="results" - value="${testRoot}/results"/> - <property - name="library-file" - value="${testRoot}/wtp-junit-tests.xml"/> - <target - name="init"> - </target> - <target - name="all" - depends="init"> - <echo - level="info" - message="Starting Unit Tests"/> - <!-- - unlike other ant tasks, subant defaults to false for - inheritall! - --> - <subant - target="" - inheritall="true"> - <fileset - dir="${testRoot}${dropinsFolder}/eclipse/plugins/"> - <exclude - name="**/*performance*/test.xml"/> - <include - name="**/test.xml"/> - </fileset> - </subant> - <echo - level="info" - message="Ended Unit Tests"/> - <antcall - target="genHtml"/> - </target> - <target - name="genHtml" - description="Generates HTML results with provided JUNIT.XSL provided" - unless="genHtml.disable"> - <xslt - style="JUNIT.XSL" - basedir="${results}/xml" - destdir="${results}/html"/> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wstfproj.tests/testScripts/wtp-junit-tests.xml deleted file mode 100644 index 938e9cd..0000000 --- a/releng.wtpbuilder/distribution/wstfproj.tests/testScripts/wtp-junit-tests.xml +++ /dev/null
@@ -1,318 +0,0 @@ -<?xml version="1.0"?> -<project - name="JUnit tests" - basedir="."> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <target - name="init"> - <property - name="junit-report-output" - value="${testRoot}/results"/> - <mkdir - 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". - --> - <property - name="extraVMargs" - value="-DextraVMargsunused=notused"/> - - <!-- if not otherwise set, use a unique workspace name --> - <property - name="data-dir" - value="${testRoot}/junitworkspaces/workspace-${classname}"/> - - <!-- - 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" - value="1800000"/> - <property - name="junit-report-output" - value="${junit-report-output}"/> - <property - name="formatter" - value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/> - <property - name="test-output" - value="${junit-report-output}/raw/${classname}.xml"/> - <property - name="jvm" - value="${env.JAVA_6_HOME}/bin/java"/> - <dirname - file="${ant.file}" - property="currentDir"/> - <echo - level="info" - message="data-dir: ${data-dir}"/> - <echo - level="info" - message="plugin-name: ${plugin-name}"/> - <echo - level="info" - message="classname: ${classname}"/> - <echo - level="info" - message="extraVMargs: ${extraVMargs}"/> - <echo - level="info" - message="timeout: ${timeout}"/> - <echo - level="info" - message="testRoot: ${testRoot}"/> - <echo - level="info" - message="ant file basedir: ${basedir}"/> - <echo - level="info" - message="junit-report-output: ${junit-report-output}"/> - <echo - level="info" - message="test-output: ${test-output}"/> - <echo - level="info" - message="buildDirectory: ${buildDirectory}"/> - <echo - level="info" - message="buildLabel: ${buildLabel}"/> - <echo - level="info" - message="jvm: ${jvm}"/> - </target> - <target - name="core-test" - depends="init"> - <echo - level="info" - message="test-type: core-test"/> - <ant - antfile="${ant.file}" - dir="${currentDir}" - target="eclipse-test"> - <property - name="application" - value="org.eclipse.test.coretestapplication"/> - </ant> - </target> - <target - name="ui-test" - depends="init"> - <echo - level="info" - message="test-type: ui-test"/> - <ant - antfile="${ant.file}" - dir="${currentDir}" - target="eclipse-test"> - <property - name="application" - value="org.eclipse.test.uitestapplication"/> - </ant> - </target> - <target - name="eclipse-test" - description="Runs the specified classname as a plug-in test."> - <echo - level="info" - message="Running ${classname}"/> - <echo - level="info" - message="Result file: ${junit-report-output}/${classname}.xml."/> - <echo - level="info" - message="DISPLAY: ${env.DISPLAY}"/> - <mkdir - dir="${junit-report-output}/httplogstest"/> - <echo - message="http log messages to: ${junit-report-output}/httplogstest"/> - <condition - property="xulRunnerParam" - value="org.eclipse.swt.browser.XULRunnerPath" - else="XULRunnerPathNotSpecified"> - <isset - property="env.WTP_XULRUNNER"/> - </condition> - <echo - 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 - an installation that would produce unpredictable results - --> - <!-- - requires ant 1.7, and at this point, we're running 1.6 from - eclipse ... <condition property="expectedNumberOfLaunchers"> - <resourcecount when="equal" count="1" > <fileset - dir="${testRoot}/eclipse/plugins"> <include - name="org.eclipse.equinox.launcher_*.jar" /> </fileset> - </resourcecount> </condition> <fail message="Did not find - expected number of launcher jars. Check installation." - unless="expectedNumberOfLaunchers" /> - --> - <java - taskname="suiteUnitTest" - fork="true" - resultProperty="suitejunitresult" - failonerror="false" - timeout="${timeout}" - dir="${testRoot}/eclipse" - jvm="${jvm}" - classname="org.eclipse.equinox.launcher.Main"> - <classpath> - <fileset - dir="${testRoot}/eclipse/plugins"> - <include - name="org.eclipse.equinox.launcher_*.jar"/> - </fileset> - </classpath> - <jvmarg - value="-Xmx256m"/> - <jvmarg - value="-Xverify"/> - <jvmarg - value="-Dosgi.ws=${env.BASEWS}"/> - <jvmarg - value="-Dosgi.os=${env.BASEOS}"/> - <jvmarg - value="-Dosgi.arch=${env.BASEARCH}"/> - <jvmarg - value="-DbuildLabel=${buildLabel}"/> - <jvmarg - value="-DbuildDirectory=${buildDirectory}"/> - <jvmarg - value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/> - <jvmarg - value="-DurlLogLocation=${junit-report-output}/httplogstest/outgoinghttplog-${plugin-name}.log"/> - <jvmarg - value="-Dwtp.autotest.noninteractive=true"/> - <jvmarg - line="${extraVMargs}"/> - <jvmarg - value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/> - <jvmarg - value="-Dprojectname=${projectname}"/> - <jvmarg - value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> - <arg - value="-nosplash"/> - <arg - value="-consolelog"/> - <arg - value="-debug"/> - <arg - value="-data"/> - <arg - value="${data-dir}"/> - <arg - value="-application"/> - <arg - value="${application}"/> - <arg - value="formatter=${formatter},${test-output}"/> - <arg - value="-testPluginName"/> - <arg - value="${plugin-name}"/> - <arg - value="-className"/> - <arg - value="${classname}"/> - <env - key="DISPLAY" - value="${env.DISPLAY}"/> - <redirector - output="${junit-report-output}/${classname}.output.txt" - error="${junit-report-output}/${classname}.error.txt"/> - </java> - <echo - level="info" - message="suitejunitresult: ${suitejunitresult}"/> - <antcall - target="summarizeFailure"/> - <antcall - target="collect-results"/> - </target> - <target - name="collect-results"> - <dirname - property="output-dir" - file="${test-output}"/> - <basename - property="output-file-name" - file="${test-output}"/> - <mkdir - dir="${junit-report-output}/xml"/> - <junitreport - todir="${junit-report-output}/xml" - tofile="${classname}.xml"> - <fileset - dir="${output-dir}"> - <include - name="${output-file-name}"/> - </fileset> - </junitreport> - <mkdir - dir="${junit-report-output}/html"/> - <xslt - style="${testRoot}/JUNIT.XSL" - basedir="${junit-report-output}" - includes="${classname}.xml" - destdir="${junit-report-output}/html"/> - </target> - <target - name="collect"> - <!-- - deprecated, each test.xml uses it, and we should remove, - eventually - --> - <echo - message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/> - </target> - <target - name="summarizeFailure" - depends="checkFailure" - if="doFailure"> - <!-- TODO: fix sdo junitFailureList.log goes in 'results', at first. Then copied. Then coordinate with releng scripts --> - <echo - append="true" - file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo> - </target> - <target - name="checkFailure"> - <condition - property="doFailure"> - <not> - <equals - arg1="${suitejunitresult}" - arg2="0" - trim="true"/> - </not> - </condition> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.tests/testdependency.xml b/releng.wtpbuilder/distribution/wstfproj.tests/testdependency.xml deleted file mode 100644 index 06afad7..0000000 --- a/releng.wtpbuilder/distribution/wstfproj.tests/testdependency.xml +++ /dev/null
@@ -1,278 +0,0 @@ -<?xml version="1.0"?> - <!-- - ====================================================================== - Properties that must be passed to this script: base.install.dir - dependencyTargets local.cache.dir dependency.properties - ====================================================================== - --> -<project - name="test" - default="get"> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <fail - message="Required property file does not exist: ${keyCfgFile}"> - <condition> - <not> - <available - file="${keyCfgFile}"/> - </not> - </condition> - </fail> - <property - file="${keyCfgFile}"/> - <condition - property="getprereq.eclipse"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.eclipseplatform"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emf"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfxsd"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfvalidation"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.gef"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.jst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dltk"> - <istrue - value="false"/> - </condition> - <target - name="get"> - <!-- - read in this properties, just so we can make sure our - requested pre-reqs are defined, which we do later with - statements such if="${groupId}.url" - --> - <property - file="${dependency.properties}"/> - <antcall - target="prereq.emf"/> - <antcall - target="prereq.emfxsd"/> - <antcall - target="prereq.emfvalidation"/> - <antcall - target="prereq.gef"/> - <antcall - target="prereq.dtp"/> - <antcall - target="prereq.wst"/> - <antcall - target="prereq.jst"/> - <antcall - target="prereq.wtp"/> - <antcall - target="prereq.dltk"/> - <antcall - target="getAndInstallBase"> - <param - name="groupId" - value="eclipse"/> - </antcall> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="eclipseTestFramework"/> - </antcall> - </target> - <target - name="prereq.eclipse" - if="getprereq.eclipse"> - <antcall - target="getAndInstallBase"> - <param - name="groupId" - value="eclipse"/> - </antcall> - </target> - <target - name="prereq.eclipseplatform" - if="getprereq.eclipseplatform"> - <antcall - target="getAndInstallBase"> - <param - name="groupId" - value="eclipseplatform"/> - </antcall> - </target> - <target - name="prereq.emf" - if="getprereq.emf"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="emf"/> - </antcall> - </target> - <target - name="prereq.emfxsd" - if="getprereq.emfxsd"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="emfxsd"/> - </antcall> - </target> - <target - name="prereq.emfvalidation" - if="getprereq.emfvalidation"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="emfvalidation"/> - </antcall> - </target> - <target - name="prereq.gef" - if="getprereq.gef"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="gef"/> - </antcall> - </target> - <target - name="prereq.dtp" - if="getprereq.dtp"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="dtp"/> - </antcall> - </target> - <target - name="prereq.wst" - if="getprereq.wst"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="wst"/> - </antcall> - </target> - <target - name="prereq.jst" - if="getprereq.jst"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="jst"/> - </antcall> - </target> - <target - name="prereq.wtp" - if="getprereq.wtp"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="wtp"/> - </antcall> - </target> - <target - name="prereq.dltk" - if="getprereq.dltk"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="dltk"/> - </antcall> - </target> - <target - name="getAndInstallBase" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}"/> - </ant> - </target> - <target - name="getAndInstallDropins" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}${dropinsFolder}"/> - </ant> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.tests/build.xml b/releng.wtpbuilder/distribution/wtpcap.tests/build.xml deleted file mode 100644 index ee16a41..0000000 --- a/releng.wtpbuilder/distribution/wtpcap.tests/build.xml +++ /dev/null
@@ -1,357 +0,0 @@ -<project - name="Build specific targets and properties" - default="runTest"> - <!-- - Note to be cross-platform, "environment variables" are only - appropriate for some variables, e.g. ones we set, since - properties are case sensitive, even if the environment variables - on your operating system are not, e.g. it will be ${env.Path} - not ${env.PATH} on Windows - --> - <property - environment="env"/> - <fail - message="testRoot must be set for this task" - unless="testRoot"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - - - <!-- - typcially already set, but in case of standalone tests, may not - be - --> - <property - name="buildLabel" - value="${buildType}-${buildId}-${timestamp}"/> - - - <!-- - Steps to do after the build is done. - --> - <target - name="test"> - <dirname - file="${ant.file}" - property="currentDirectory"/> - <ant - antfile="${ant.file}" - target="runTest" - dir="${currentDirectory}"/> - </target> - - <!-- - Steps to do to test the build results - --> - <target - name="runTest"> - <dirname - file="${ant.file}" - property="test.component.dir"/> - <ant - antfile="${wtp.builder.home}/scripts/build/label.xml"/> - <property - file="${buildDirectory}/label.properties"/> - <property - file="${wtp.builder.home}/build.properties"/> - <fail - message="testRoot must be set for this task" - unless="testRoot"/> - <mkdir - dir="${testRoot}"/> - - <!-- if results already exist, delete them --> - <delete - dir="${testRoot}/results" - failOnError="false"/> - <mkdir - dir="${testRoot}/results"/> - <mkdir - dir="${testRoot}/results/consolelogs"/> - <copy - todir="${testRoot}" - overwrite="true"> - <fileset - dir="${test.component.dir}/testScripts"/> - </copy> - <echo - message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/> - <!-- - for this distribution, dependencies come from releng. Assume - no subdirectory, if not otherwise set (bug 285383). - --> - <property - name="env.DEP_DIR" - value=""/> - <property - name="dependency.properties" - value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/> - <available - file="${dependency.properties}" - property="dependency.properties.exists"/> - <fail - message="dependency file not found: ${dependency.properties}" - unless="dependency.properties.exists"/> - <ant - antfile="${test.component.dir}/testdependency.xml" - target="get"> - <property - name="base.install.dir" - value="${testRoot}"/> - </ant> - <antcall - target="unzipTests"/> - <antcall - target="runTestEclipse"> - <param - name="testTarget" - value="all"/> - </antcall> - <antcall - target="postRunTestEclipse"> - <param - name="testTarget" - value="all"/> - </antcall> - </target> - <target - name="unzipTests"> - <!-- - unzip the builds and junit tests we use 'unzip' here, so we - can continue on error, if desired. (such as if zip was not - created, due to other failures or options). - --> - <exec - dir="${buildDirectory}/${buildLabel}" - executable="unzip" - failonerror="true"> - <arg - line="-o -qq wtpcap-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/> - </exec> - <exec - dir="${buildDirectory}/${buildLabel}" - executable="unzip" - failonerror="true"> - <arg - line="-o -qq wtpcap-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/> - </exec> - </target> - <!-- - time out may need to be set/adjust for api or performance tests? - This testTimeLimit is the whole, overall limit on tests. There's - a shorter one for individual suites. 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="testTimeLimit" - value="1800000"/> - <property - name="testFailOnError" - value="false"/> - <target - name="runTestEclipse" - description="Run our JUnit's within an instance of antRunner"> - <property - name="test-vm" - value="${env.JAVA_6_HOME}/bin/java"/> - - <!-- - set path to eclipse folder. If local folder, use '.'; - otherwise, use c:\path\to\eclipse or /path/to/eclipse/ - --> - <property - name="eclipse.home" - value="${testRoot}"/> - <echo - message="testTarget: ${testTarget}"/> - <!-- - can not pass in empty values in jvmargs so if not testBundle - specified, we'll pass a junk (unused) value - --> - <condition - property="testBundleParam" - value="-DtestBundle=${testBundle}" - else="-Dunused=nouse"> - <isset - property="testBundle"/> - </condition> - <echo - message="Running junits"/> - <!-- - If there is not exactly one launcher in the stack, we'd best - fail fast, since we are not expecting that, and may indicate - an installation that would produce unpredictable results - --> - <!-- - requires ant 1.7, and at this point, we're running 1.6 from - eclipse ... <condition property="expectedNumberOfLaunchers"> - <resourcecount when="equal" count="1" > <fileset - dir="${testRoot}/eclipse/plugins"> <include - name="org.eclipse.equinox.launcher_*.jar" /> </fileset> - </resourcecount> </condition> <fail message="Did not find - expected number of launcher jars. Check installation." - unless="expectedNumberOfLaunchers" /> - --> - <!-- - Remember: using dash 'debug' for org.eclipse.ant.core.antRunner - produces ant debug info to be output ... which is a TON of - stuff. Even 'verbose' is a bit too much. - --> - <echo - message="eclipse.launcher: ${eclipse.launcher}"/> - <java - taskname="unit-test-masterprocess" - fork="true" - resultProperty="wtpmasterjunitresult" - failonerror="false" - timeout="${testTimeLimit}" - dir="${testRoot}/eclipse" - jvm="${env.JAVA_6_HOME}/bin/java" - classname="org.eclipse.equinox.launcher.Main"> - <classpath> - <fileset - dir="${testRoot}/eclipse/plugins"> - <include - name="org.eclipse.equinox.launcher_*.jar"/> - </fileset> - </classpath> - <jvmarg - value="-Dosgi.ws=${env.BASEWS}"/> - <jvmarg - value="-Dosgi.os=${env.BASEOS}"/> - <jvmarg - value="-Dosgi.arch=${env.BASEARCH}"/> - <jvmarg - value="-Dws=${env.BASEWS}"/> - <jvmarg - value="-Dos=${env.BASEOS}"/> - <jvmarg - value="-Darch=${env.BASEARCH}"/> - <jvmarg - value="-DbuildBranch=${buildBranch}"/> - <jvmarg - value="-DbuildType=${buildType}"/> - <jvmarg - value="-DbuildId=${buildId}"/> - <jvmarg - value="-Dprojectname=${projectname}"/> - <jvmarg - value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/> - <jvmarg - value="${testBundleParam}"/> - <arg - value="-nosplash"/> - <arg - value="-consolelog"/> - <arg - value="-data"/> - <arg - value="${testRoot}/overallTestWorkspace"/> - <arg - value="-application"/> - <arg - value="org.eclipse.ant.core.antRunner"/> - <arg - value="-logger"/> - <arg - value="org.apache.tools.ant.DefaultLogger"/> - <arg - value="-file"/> - <arg - value="${testRoot}/test.xml"/> - <arg - value="${testTarget}"/> - - <!-- make sure our forked env has a DISPLAY --> - <env - key="DISPLAY" - value="${env.DISPLAY}"/> - <redirector - output="${testRoot}/results/fullOutput.txt" - error="${testRoot}/results/fullErrorLog.txt"/> - <jvmarg - value="-Dbuild.home=${env.BUILD_HOME}"/> - <jvmarg - value="-DbuildDirectory=${buildDirectory}"/> - <jvmarg - value="-DbuildLabel=${buildLabel}"/> - <jvmarg - value="-DbaseLocation=${baseLocation}"/> - <jvmarg - value="-DtestRoot=${testRoot}"/> - <jvmarg - value="-DtestDir=${testRoot}"/> - <jvmarg - value="-DeclipseBuilderDirectory=${pde.builder.path}"/> - </java> - <echo - message="wtpmasterjunitresult ${wtpmasterjunitresult}"/> - </target> - <target - name="postRunTestEclipse"> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results"> - <include - name="*output.txt"/> - </fileset> - </copy> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results"> - <include - name="*error.txt"/> - </fileset> - </copy> - <copy - file="${testRoot}/results/fullOutput.txt" - toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full" - overwrite="true" - failonerror="false"> - </copy> - <copy - file="${testRoot}/results/fullErrorLog.txt" - toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full" - overwrite="true" - failonerror="false"> - </copy> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/xml" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results/xml"> - <include - name="*.xml"/> - </fileset> - </copy> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/html" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results/html"> - <include - name="*.html"/> - </fileset> - </copy> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/wtpcap.tests/templateFiles/index.php deleted file mode 100644 index a42c883..0000000 --- a/releng.wtpbuilder/distribution/wtpcap.tests/templateFiles/index.php +++ /dev/null
@@ -1,85 +0,0 @@ -<html> -<head> - -<?php -$parts = explode("/", realpath("..")); -$label = $parts[count($parts) - 1]; -?> - -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" - type="text/css"> -</head> -<body> -<p><b><font face="Verdana" size="+3">Test Results</font></b></p> -<table border=0 cellspacing=5 cellpadding=2 width="100%"> - <tr> - <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font - color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?> - </font></b></td> - </tr> -</table> -<p></p> -<table border="0"> -</table> - -<table width="77%" border="1"> - <tr> - <td width="81%"><b>Tests Performed</b></td> - <td width="19%"><b>Errors & Failures</b></td> - </tr> - - <? - $dir = dir("html"); - while ($anEntry = $dir->read()) - { - if ($anEntry != "." && $anEntry != "..") - { - $link = "html/".$anEntry; - $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml"; - $count = 0; - $fileHandle = fopen($xml, "r"); - while (!feof($fileHandle)) - { - $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0 - $count = $count + substr_count($aLine, '<error'); - } - fclose($fileHandle); - if ($count > 0) - { - echo "<tr><td><a href=\"$link\"><b><font color=\"red\">"; - echo "$anEntry"; - echo "</font></b></a></td>"; - echo "<td><b><font color=\"red\">$count</font></b></td></tr>"; - } - else - { - echo "<tr><td><a href=\"$link\">"; - echo "$anEntry"; - echo "</a></td>"; - echo "<td>$count</td></tr>"; - } - } - } - ?> - -</table> -<p></p> -<br> -<table border=0 cellspacing=5 cellpadding=2 width="100%"> - <tr> - <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font - color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?> - </font></b></td> - </tr> -</table> -<br> -These -<a href="consolelogs/wtptestlog.txt">logs</a> -contain the console output captured while running the JUnit automated -tests. -<br> -<br> - -</body> -</html>
diff --git a/releng.wtpbuilder/distribution/wtpcap.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/wtpcap.tests/testScripts/JUNIT.XSL deleted file mode 100644 index 9cdd80e..0000000 --- a/releng.wtpbuilder/distribution/wtpcap.tests/testScripts/JUNIT.XSL +++ /dev/null
@@ -1,703 +0,0 @@ -<xsl:stylesheet - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - <xsl:output - method="html" - indent="yes"/> - <xsl:decimal-format - decimal-separator="." - grouping-separator=","/> - <xsl:template - match="testsuites"> - <HTML> - <HEAD> - <style - type="text/css"> body { font:normal 68% - verdana,arial,helvetica; color:#000000; } table tr - td, table tr th { font-size: 68%; } table.details tr - th{ font-weight: bold; text-align:left; - background:#a6caf0; } table.details tr td{ - background:#eeeee0; } p { line-height:1.5em; - margin-top:0.5em; margin-bottom:1.0em; } h1 { - margin: 0px 0px 5px; font: 165% - verdana,arial,helvetica } h2 { margin-top: 1em; - margin-bottom: 0.5em; font: bold 125% - verdana,arial,helvetica } h3 { margin-bottom: 0.5em; - font: bold 115% verdana,arial,helvetica } h4 { - margin-bottom: 0.5em; font: bold 100% - verdana,arial,helvetica } h5 { margin-bottom: 0.5em; - font: bold 100% verdana,arial,helvetica } h6 { - margin-bottom: 0.5em; font: bold 100% - verdana,arial,helvetica } .Error { font-weight:bold; - color:red; } .Failure { font-weight:bold; - color:purple; } .Properties { text-align:right; } </style> - <script - language="JavaScript"> - var TestCases = new Array(); var cur; - <xsl:for-each - select="./testsuite"> - <xsl:apply-templates - select="properties"/> - </xsl:for-each> - </script> - <script - language="JavaScript"><![CDATA[ - function displayProperties (name) { - var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); - var doc = win.document.open(); - doc.write("<html><head><title>Properties of " + name + "</title>"); - doc.write("<style>") - doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); - doc.write("table tr td, table tr th { font-size: 68%; }"); - doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); - doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); - doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); - doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); - doc.write("</style>"); - doc.write("</head><body>"); - doc.write("<h3>Properties of " + name + "</h3>"); - doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); - doc.write("<table class='properties'>"); - doc.write("<tr><th>Name</th><th>Value</th></tr>"); - for (prop in TestCases[name]) { - doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); - } - doc.write("</table>"); - doc.write("</body></html>"); - doc.close(); - win.focus(); - } - ]]> - </script> - </HEAD> - <body> - <a - name="top"></a> - <xsl:call-template - name="pageHeader"/> - - <!-- Summary part --> - <xsl:call-template - name="summary"/> - <hr - size="1" - width="95%" - align="left"/> - - <!-- Package List part --> - <xsl:call-template - name="packagelist"/> - <hr - size="1" - width="95%" - align="left"/> - - <!-- For each package create its part --> - <xsl:call-template - name="packages"/> - <hr - size="1" - width="95%" - align="left"/> - - <!-- For each class create the part --> - <xsl:call-template - name="classes"/> - </body> - </HTML> - </xsl:template> - <!-- - ================================================================== - --> - <!-- - Write a list of all packages with an hyperlink to the anchor of - --> - <!-- - of the package name. - --> - <!-- - ================================================================== - --> - <xsl:template - name="packagelist"> - <h2>Packages</h2> - Note: package statistics are not computed recursively, they only - sum up all of its testsuites numbers. - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <xsl:call-template - name="testsuite.test.header"/> - <!-- list all packages recursively --> - <xsl:for-each - select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> - <xsl:sort - select="@package"/> - <xsl:variable - name="testsuites-in-package" - select="/testsuites/testsuite[./@package = current()/@package]"/> - <xsl:variable - name="testCount" - select="sum($testsuites-in-package/@tests)"/> - <xsl:variable - name="errorCount" - select="sum($testsuites-in-package/@errors)"/> - <xsl:variable - name="failureCount" - select="sum($testsuites-in-package/@failures)"/> - <xsl:variable - name="timeCount" - select="sum($testsuites-in-package/@time)"/> - - <!-- write a summary for the package --> - <tr - valign="top"> - <!-- set a nice color depending if there is an error/failure --> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="$failureCount > 0">Failure</xsl:when> - <xsl:when - test="$errorCount > 0">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - <td> - <a - href="#{@package}"> - <xsl:value-of - select="@package"/> - </a> - </td> - <td> - <xsl:value-of - select="$testCount"/> - </td> - <td> - <xsl:value-of - select="$errorCount"/> - </td> - <td> - <xsl:value-of - select="$failureCount"/> - </td> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="$timeCount"/> - </xsl:call-template> - </td> - </tr> - </xsl:for-each> - </table> - </xsl:template> - <!-- - ================================================================== - --> - <!-- - Write a package level report - --> - <!-- - It creates a table with values from the document: - --> - <!-- - Name | Tests | Errors | Failures | Time - --> - <!-- - ================================================================== - --> - <xsl:template - name="packages"> - <!-- create an anchor to this package name --> - <xsl:for-each - select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> - <xsl:sort - select="@package"/> - <a - name="{@package}"></a> - <h3> - Package - <xsl:value-of - select="@package"/> - </h3> - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <xsl:call-template - name="testsuite.test.header"/> - - <!-- match the testsuites of this package --> - <xsl:apply-templates - select="/testsuites/testsuite[./@package = current()/@package]" - mode="print.test"/> - </table> - <a - href="#top">Back to top</a> - <p/> - <p/> - </xsl:for-each> - </xsl:template> - <xsl:template - name="classes"> - <xsl:for-each - select="testsuite"> - <xsl:sort - select="@name"/> - <!-- create an anchor to this class name --> - <a - name="{@name}"></a> - <h3> - TestCase - <xsl:value-of - select="@name"/> - </h3> - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <xsl:call-template - name="testcase.test.header"/> - <!-- - test can even not be started at all (failure to load - the class) so report the error directly - --> - <xsl:if - test="./error"> - <tr - class="Error"> - <td - colspan="4"> - <xsl:apply-templates - select="./error"/> - </td> - </tr> - </xsl:if> - <xsl:apply-templates - select="./testcase" - mode="print.test"/> - </table> - <div - class="Properties"> - <a> - <xsl:attribute - name="href">javascript:displayProperties('<xsl:value-of - select="@package"/>.<xsl:value-of - select="@name"/>');</xsl:attribute> - Properties >> - </a> - </div> - <p/> - <a - href="#top">Back to top</a> - </xsl:for-each> - </xsl:template> - <xsl:template - name="summary"> - <h2>Summary</h2> - <xsl:variable - name="testCount" - select="sum(testsuite/@tests)"/> - <xsl:variable - name="errorCount" - select="sum(testsuite/@errors)"/> - <xsl:variable - name="failureCount" - select="sum(testsuite/@failures)"/> - <xsl:variable - name="timeCount" - select="sum(testsuite/@time)"/> - <xsl:variable - name="successRate" - select="($testCount - $failureCount - $errorCount) div $testCount"/> - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <tr - valign="top"> - <th>Tests</th> - <th>Failures</th> - <th>Errors</th> - <th>Success rate</th> - <th>Time</th> - </tr> - <tr - valign="top"> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="$failureCount > 0">Failure</xsl:when> - <xsl:when - test="$errorCount > 0">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - <td> - <xsl:value-of - select="$testCount"/> - </td> - <td> - <xsl:value-of - select="$failureCount"/> - </td> - <td> - <xsl:value-of - select="$errorCount"/> - </td> - <td> - <xsl:call-template - name="display-percent"> - <xsl:with-param - name="value" - select="$successRate"/> - </xsl:call-template> - </td> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="$timeCount"/> - </xsl:call-template> - </td> - </tr> - </table> - <table - border="0" - width="95%"> - <tr> - <td - style="text-align: justify;"> - Note: - <i>failures</i> - are anticipated and checked for with assertions - while - <i>errors</i> - are unanticipated. - </td> - </tr> - </table> - </xsl:template> - <!-- - Write properties into a JavaScript data structure. This is based - on the original idea by Erik Hatcher (erik@hatcher.net) - --> - <xsl:template - match="properties"> - cur = TestCases[' - <xsl:value-of - select="../@package"/> - . - <xsl:value-of - select="../@name"/> - '] = new Array(); - <xsl:for-each - select="property"> - <xsl:sort - select="@name"/> - cur[' - <xsl:value-of - select="@name"/> - '] = ' - <xsl:call-template - name="JS-escape"> - <xsl:with-param - name="string" - select="@value"/> - </xsl:call-template> - '; - </xsl:for-each> - </xsl:template> - - <!-- Page HEADER --> - <xsl:template - name="pageHeader"> - <h1>Unit Test Results</h1> - <table - width="100%"> - <tr> - <td - align="left"></td> - <td - align="right"> - Designed for use with - <a - href='http://www.junit.org'>JUnit</a> - and - <a - href='http://jakarta.apache.org/ant'>Ant</a> - . - </td> - </tr> - </table> - <hr - size="1"/> - </xsl:template> - <xsl:template - match="testsuite" - mode="header"> - <tr - valign="top"> - <th - width="80%">Name</th> - <th>Tests</th> - <th>Errors</th> - <th>Failures</th> - <th - nowrap="nowrap">Time(s)</th> - </tr> - </xsl:template> - - <!-- class header --> - <xsl:template - name="testsuite.test.header"> - <tr - valign="top"> - <th - width="80%">Name</th> - <th>Tests</th> - <th>Errors</th> - <th>Failures</th> - <th - nowrap="nowrap">Time(s)</th> - </tr> - </xsl:template> - - <!-- method header --> - <xsl:template - name="testcase.test.header"> - <tr - valign="top"> - <th>Name</th> - <th>Status</th> - <th - width="80%">Type</th> - <th - nowrap="nowrap">Time(s)</th> - </tr> - </xsl:template> - - - <!-- class information --> - <xsl:template - match="testsuite" - mode="print.test"> - <tr - valign="top"> - <!-- set a nice color depending if there is an error/failure --> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="@failures[.> 0]">Failure</xsl:when> - <xsl:when - test="@errors[.> 0]">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - - <!-- print testsuite information --> - <td> - <a - href="#{@name}"> - <xsl:value-of - select="@name"/> - </a> - </td> - <td> - <xsl:value-of - select="@tests"/> - </td> - <td> - <xsl:value-of - select="@errors"/> - </td> - <td> - <xsl:value-of - select="@failures"/> - </td> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="@time"/> - </xsl:call-template> - </td> - </tr> - </xsl:template> - <xsl:template - match="testcase" - mode="print.test"> - <tr - valign="top"> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="failure | error">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - <td> - <xsl:value-of - select="@name"/> - </td> - <xsl:choose> - <xsl:when - test="failure"> - <td>Failure</td> - <td> - <xsl:apply-templates - select="failure"/> - </td> - </xsl:when> - <xsl:when - test="error"> - <td>Error</td> - <td> - <xsl:apply-templates - select="error"/> - </td> - </xsl:when> - <xsl:otherwise> - <td>Success</td> - <td></td> - </xsl:otherwise> - </xsl:choose> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="@time"/> - </xsl:call-template> - </td> - </tr> - </xsl:template> - <xsl:template - match="failure"> - <xsl:call-template - name="display-failures"/> - </xsl:template> - <xsl:template - match="error"> - <xsl:call-template - name="display-failures"/> - </xsl:template> - - <!-- Style for the error and failure in the tescase template --> - <xsl:template - name="display-failures"> - <xsl:choose> - <xsl:when - test="not(@message)"> - N/A - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="@message"/> - </xsl:otherwise> - </xsl:choose> - <!-- display the stacktrace --> - <code> - <p/> - <xsl:call-template - name="br-replace"> - <xsl:with-param - name="word" - select="."/> - </xsl:call-template> - </code> - <!-- - the later is better but might be problematic for non-21" - monitors... - --> - <!--pre><xsl:value-of select="."/></pre--> - </xsl:template> - <xsl:template - name="JS-escape"> - <xsl:param - name="string"/> - <xsl:choose> - <!-- - something isn't right here, basically all single quotes - need to be replaced with backslash-single-quote - <xsl:when test="contains($string,''')"> - <xsl:value-of - select="substring-before($string,''')"/> \' - <xsl:call-template name="JS-escape"> <xsl:with-param - name="string" - select="substring-after($string,''')"/> - </xsl:call-template> </xsl:when> - --> - <xsl:when - test="contains($string,'\')"> - <xsl:value-of - select="substring-before($string,'\')"/> - \\ - <xsl:call-template - name="JS-escape"> - <xsl:with-param - name="string" - select="substring-after($string,'\')"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$string"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - <!-- - template that will convert a carriage return into a br tag - @param word the text from which to convert CR to BR tag - --> - <xsl:template - name="br-replace"> - <xsl:param - name="word"/> - <xsl:choose> - <xsl:when - test="contains($word,'
')"> - <xsl:value-of - select="substring-before($word,'
')"/> - <br/> - <xsl:call-template - name="br-replace"> - <xsl:with-param - name="word" - select="substring-after($word,'
')"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$word"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - <xsl:template - name="display-time"> - <xsl:param - name="value"/> - <xsl:value-of - select="format-number($value,'0.000')"/> - </xsl:template> - <xsl:template - name="display-percent"> - <xsl:param - name="value"/> - <xsl:value-of - select="format-number($value,'0.00%')"/> - </xsl:template> -</xsl:stylesheet> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtpcap.tests/testScripts/test.xml deleted file mode 100644 index e3b5f65..0000000 --- a/releng.wtpbuilder/distribution/wtpcap.tests/testScripts/test.xml +++ /dev/null
@@ -1,104 +0,0 @@ -<project - name="Automated Eclipse Testing" - default="all" - basedir="."> - <property - environment="env"/> - - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <echo - level="info" - message="starting Automated Eclipse Testing"/> - <echo - level="info" - message="ant file basedir: ${basedir}"/> - <echo - level="info" - message="testRoot: ${testRoot}"/> - <fail - message="testRoot must be set" - unless="testRoot"/> - - <!--properties file containing the build information--> - <property - file="${buildDirectory}/label.properties"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - - <!-- - name that can be added to report name to identify which platform - tests results come from - --> - <property - name="platform" - value=""/> - - <!-- TODO: The framework apps might need this. But we should elmimnate if posslbe. --> - <property - name="eclipse-home" - value="${testRoot}"/> - <!-- - The directory that will contain the xml and html results from - the tests that are run - --> - <property - name="results" - value="${testRoot}/results"/> - <property - name="library-file" - value="${testRoot}/wtp-junit-tests.xml"/> - <target - name="init"> - </target> - <target - name="all" - depends="init"> - <echo - level="info" - message="Starting Unit Tests"/> - <!-- - unlike other ant tasks, subant defaults to false for - inheritall! - --> - <subant - target="" - inheritall="true"> - <fileset - dir="${testRoot}${dropinsFolder}/eclipse/plugins/"> - <exclude - name="**/*performance*/test.xml"/> - <include - name="**/test.xml"/> - </fileset> - </subant> - <echo - level="info" - message="Ended Unit Tests"/> - <antcall - target="genHtml"/> - </target> - <target - name="genHtml" - description="Generates HTML results with provided JUNIT.XSL provided" - unless="genHtml.disable"> - <xslt - style="JUNIT.XSL" - basedir="${results}/xml" - destdir="${results}/html"/> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtpcap.tests/testScripts/wtp-junit-tests.xml deleted file mode 100644 index 938e9cd..0000000 --- a/releng.wtpbuilder/distribution/wtpcap.tests/testScripts/wtp-junit-tests.xml +++ /dev/null
@@ -1,318 +0,0 @@ -<?xml version="1.0"?> -<project - name="JUnit tests" - basedir="."> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <target - name="init"> - <property - name="junit-report-output" - value="${testRoot}/results"/> - <mkdir - 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". - --> - <property - name="extraVMargs" - value="-DextraVMargsunused=notused"/> - - <!-- if not otherwise set, use a unique workspace name --> - <property - name="data-dir" - value="${testRoot}/junitworkspaces/workspace-${classname}"/> - - <!-- - 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" - value="1800000"/> - <property - name="junit-report-output" - value="${junit-report-output}"/> - <property - name="formatter" - value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/> - <property - name="test-output" - value="${junit-report-output}/raw/${classname}.xml"/> - <property - name="jvm" - value="${env.JAVA_6_HOME}/bin/java"/> - <dirname - file="${ant.file}" - property="currentDir"/> - <echo - level="info" - message="data-dir: ${data-dir}"/> - <echo - level="info" - message="plugin-name: ${plugin-name}"/> - <echo - level="info" - message="classname: ${classname}"/> - <echo - level="info" - message="extraVMargs: ${extraVMargs}"/> - <echo - level="info" - message="timeout: ${timeout}"/> - <echo - level="info" - message="testRoot: ${testRoot}"/> - <echo - level="info" - message="ant file basedir: ${basedir}"/> - <echo - level="info" - message="junit-report-output: ${junit-report-output}"/> - <echo - level="info" - message="test-output: ${test-output}"/> - <echo - level="info" - message="buildDirectory: ${buildDirectory}"/> - <echo - level="info" - message="buildLabel: ${buildLabel}"/> - <echo - level="info" - message="jvm: ${jvm}"/> - </target> - <target - name="core-test" - depends="init"> - <echo - level="info" - message="test-type: core-test"/> - <ant - antfile="${ant.file}" - dir="${currentDir}" - target="eclipse-test"> - <property - name="application" - value="org.eclipse.test.coretestapplication"/> - </ant> - </target> - <target - name="ui-test" - depends="init"> - <echo - level="info" - message="test-type: ui-test"/> - <ant - antfile="${ant.file}" - dir="${currentDir}" - target="eclipse-test"> - <property - name="application" - value="org.eclipse.test.uitestapplication"/> - </ant> - </target> - <target - name="eclipse-test" - description="Runs the specified classname as a plug-in test."> - <echo - level="info" - message="Running ${classname}"/> - <echo - level="info" - message="Result file: ${junit-report-output}/${classname}.xml."/> - <echo - level="info" - message="DISPLAY: ${env.DISPLAY}"/> - <mkdir - dir="${junit-report-output}/httplogstest"/> - <echo - message="http log messages to: ${junit-report-output}/httplogstest"/> - <condition - property="xulRunnerParam" - value="org.eclipse.swt.browser.XULRunnerPath" - else="XULRunnerPathNotSpecified"> - <isset - property="env.WTP_XULRUNNER"/> - </condition> - <echo - 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 - an installation that would produce unpredictable results - --> - <!-- - requires ant 1.7, and at this point, we're running 1.6 from - eclipse ... <condition property="expectedNumberOfLaunchers"> - <resourcecount when="equal" count="1" > <fileset - dir="${testRoot}/eclipse/plugins"> <include - name="org.eclipse.equinox.launcher_*.jar" /> </fileset> - </resourcecount> </condition> <fail message="Did not find - expected number of launcher jars. Check installation." - unless="expectedNumberOfLaunchers" /> - --> - <java - taskname="suiteUnitTest" - fork="true" - resultProperty="suitejunitresult" - failonerror="false" - timeout="${timeout}" - dir="${testRoot}/eclipse" - jvm="${jvm}" - classname="org.eclipse.equinox.launcher.Main"> - <classpath> - <fileset - dir="${testRoot}/eclipse/plugins"> - <include - name="org.eclipse.equinox.launcher_*.jar"/> - </fileset> - </classpath> - <jvmarg - value="-Xmx256m"/> - <jvmarg - value="-Xverify"/> - <jvmarg - value="-Dosgi.ws=${env.BASEWS}"/> - <jvmarg - value="-Dosgi.os=${env.BASEOS}"/> - <jvmarg - value="-Dosgi.arch=${env.BASEARCH}"/> - <jvmarg - value="-DbuildLabel=${buildLabel}"/> - <jvmarg - value="-DbuildDirectory=${buildDirectory}"/> - <jvmarg - value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/> - <jvmarg - value="-DurlLogLocation=${junit-report-output}/httplogstest/outgoinghttplog-${plugin-name}.log"/> - <jvmarg - value="-Dwtp.autotest.noninteractive=true"/> - <jvmarg - line="${extraVMargs}"/> - <jvmarg - value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/> - <jvmarg - value="-Dprojectname=${projectname}"/> - <jvmarg - value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> - <arg - value="-nosplash"/> - <arg - value="-consolelog"/> - <arg - value="-debug"/> - <arg - value="-data"/> - <arg - value="${data-dir}"/> - <arg - value="-application"/> - <arg - value="${application}"/> - <arg - value="formatter=${formatter},${test-output}"/> - <arg - value="-testPluginName"/> - <arg - value="${plugin-name}"/> - <arg - value="-className"/> - <arg - value="${classname}"/> - <env - key="DISPLAY" - value="${env.DISPLAY}"/> - <redirector - output="${junit-report-output}/${classname}.output.txt" - error="${junit-report-output}/${classname}.error.txt"/> - </java> - <echo - level="info" - message="suitejunitresult: ${suitejunitresult}"/> - <antcall - target="summarizeFailure"/> - <antcall - target="collect-results"/> - </target> - <target - name="collect-results"> - <dirname - property="output-dir" - file="${test-output}"/> - <basename - property="output-file-name" - file="${test-output}"/> - <mkdir - dir="${junit-report-output}/xml"/> - <junitreport - todir="${junit-report-output}/xml" - tofile="${classname}.xml"> - <fileset - dir="${output-dir}"> - <include - name="${output-file-name}"/> - </fileset> - </junitreport> - <mkdir - dir="${junit-report-output}/html"/> - <xslt - style="${testRoot}/JUNIT.XSL" - basedir="${junit-report-output}" - includes="${classname}.xml" - destdir="${junit-report-output}/html"/> - </target> - <target - name="collect"> - <!-- - deprecated, each test.xml uses it, and we should remove, - eventually - --> - <echo - message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/> - </target> - <target - name="summarizeFailure" - depends="checkFailure" - if="doFailure"> - <!-- TODO: fix sdo junitFailureList.log goes in 'results', at first. Then copied. Then coordinate with releng scripts --> - <echo - append="true" - file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo> - </target> - <target - name="checkFailure"> - <condition - property="doFailure"> - <not> - <equals - arg1="${suitejunitresult}" - arg2="0" - trim="true"/> - </not> - </condition> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtpcap.tests/testdependency.xml deleted file mode 100644 index 06afad7..0000000 --- a/releng.wtpbuilder/distribution/wtpcap.tests/testdependency.xml +++ /dev/null
@@ -1,278 +0,0 @@ -<?xml version="1.0"?> - <!-- - ====================================================================== - Properties that must be passed to this script: base.install.dir - dependencyTargets local.cache.dir dependency.properties - ====================================================================== - --> -<project - name="test" - default="get"> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <fail - message="Required property file does not exist: ${keyCfgFile}"> - <condition> - <not> - <available - file="${keyCfgFile}"/> - </not> - </condition> - </fail> - <property - file="${keyCfgFile}"/> - <condition - property="getprereq.eclipse"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.eclipseplatform"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emf"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfxsd"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emfvalidation"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.gef"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.jst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dltk"> - <istrue - value="false"/> - </condition> - <target - name="get"> - <!-- - read in this properties, just so we can make sure our - requested pre-reqs are defined, which we do later with - statements such if="${groupId}.url" - --> - <property - file="${dependency.properties}"/> - <antcall - target="prereq.emf"/> - <antcall - target="prereq.emfxsd"/> - <antcall - target="prereq.emfvalidation"/> - <antcall - target="prereq.gef"/> - <antcall - target="prereq.dtp"/> - <antcall - target="prereq.wst"/> - <antcall - target="prereq.jst"/> - <antcall - target="prereq.wtp"/> - <antcall - target="prereq.dltk"/> - <antcall - target="getAndInstallBase"> - <param - name="groupId" - value="eclipse"/> - </antcall> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="eclipseTestFramework"/> - </antcall> - </target> - <target - name="prereq.eclipse" - if="getprereq.eclipse"> - <antcall - target="getAndInstallBase"> - <param - name="groupId" - value="eclipse"/> - </antcall> - </target> - <target - name="prereq.eclipseplatform" - if="getprereq.eclipseplatform"> - <antcall - target="getAndInstallBase"> - <param - name="groupId" - value="eclipseplatform"/> - </antcall> - </target> - <target - name="prereq.emf" - if="getprereq.emf"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="emf"/> - </antcall> - </target> - <target - name="prereq.emfxsd" - if="getprereq.emfxsd"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="emfxsd"/> - </antcall> - </target> - <target - name="prereq.emfvalidation" - if="getprereq.emfvalidation"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="emfvalidation"/> - </antcall> - </target> - <target - name="prereq.gef" - if="getprereq.gef"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="gef"/> - </antcall> - </target> - <target - name="prereq.dtp" - if="getprereq.dtp"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="dtp"/> - </antcall> - </target> - <target - name="prereq.wst" - if="getprereq.wst"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="wst"/> - </antcall> - </target> - <target - name="prereq.jst" - if="getprereq.jst"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="jst"/> - </antcall> - </target> - <target - name="prereq.wtp" - if="getprereq.wtp"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="wtp"/> - </antcall> - </target> - <target - name="prereq.dltk" - if="getprereq.dltk"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="dltk"/> - </antcall> - </target> - <target - name="getAndInstallBase" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}"/> - </ant> - </target> - <target - name="getAndInstallDropins" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}${dropinsFolder}"/> - </ant> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.tests/build.xml b/releng.wtpbuilder/distribution/wtpjee.tests/build.xml deleted file mode 100644 index fdb1cd7..0000000 --- a/releng.wtpbuilder/distribution/wtpjee.tests/build.xml +++ /dev/null
@@ -1,357 +0,0 @@ -<project - name="Build specific targets and properties" - default="runTest"> - <!-- - Note to be cross-platform, "environment variables" are only - appropriate for some variables, e.g. ones we set, since - properties are case sensitive, even if the environment variables - on your operating system are not, e.g. it will be ${env.Path} - not ${env.PATH} on Windows - --> - <property - environment="env"/> - <fail - message="testRoot must be set for this task" - unless="testRoot"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - - - <!-- - typcially already set, but in case of standalone tests, may not - be - --> - <property - name="buildLabel" - value="${buildType}-${buildId}-${timestamp}"/> - - - <!-- - Steps to do after the build is done. - --> - <target - name="test"> - <dirname - file="${ant.file}" - property="currentDirectory"/> - <ant - antfile="${ant.file}" - target="runTest" - dir="${currentDirectory}"/> - </target> - - <!-- - Steps to do to test the build results - --> - <target - name="runTest"> - <dirname - file="${ant.file}" - property="test.component.dir"/> - <ant - antfile="${wtp.builder.home}/scripts/build/label.xml"/> - <property - file="${buildDirectory}/label.properties"/> - <property - file="${wtp.builder.home}/build.properties"/> - <fail - message="testRoot must be set for this task" - unless="testRoot"/> - <mkdir - dir="${testRoot}"/> - - <!-- if results already exist, delete them --> - <delete - dir="${testRoot}/results" - failOnError="false"/> - <mkdir - dir="${testRoot}/results"/> - <mkdir - dir="${testRoot}/results/consolelogs"/> - <copy - todir="${testRoot}" - overwrite="true"> - <fileset - dir="${test.component.dir}/testScripts"/> - </copy> - <echo - message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/> - <!-- - for this distribution, dependencies come from releng. Assume - no subdirectory, if not otherwise set (bug 285383). - --> - <property - name="env.DEP_DIR" - value=""/> - <property - name="dependency.properties" - value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/> - <available - file="${dependency.properties}" - property="dependency.properties.exists"/> - <fail - message="dependency file not found: ${dependency.properties}" - unless="dependency.properties.exists"/> - <ant - antfile="${test.component.dir}/testdependency.xml" - target="get"> - <property - name="base.install.dir" - value="${testRoot}"/> - </ant> - <antcall - target="unzipTests"/> - <antcall - target="runTestEclipse"> - <param - name="testTarget" - value="all"/> - </antcall> - <antcall - target="postRunTestEclipse"> - <param - name="testTarget" - value="all"/> - </antcall> - </target> - <target - name="unzipTests"> - <!-- - unzip the builds and junit tests we use 'unzip' here, so we - can continue on error, if desired. (such as if zip was not - created, due to other failures or options). - --> - <exec - dir="${buildDirectory}/${buildLabel}" - executable="unzip" - failonerror="true"> - <arg - line="-o -qq wtpjee-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/> - </exec> - <exec - dir="${buildDirectory}/${buildLabel}" - executable="unzip" - failonerror="true"> - <arg - line="-o -qq wtpjee-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/> - </exec> - </target> - <!-- - time out may need to be set/adjust for api or performance tests? - This testTimeLimit is the whole, overall limit on tests. There's - a shorter one for individual suites. 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="testTimeLimit" - value="1800000"/> - <property - name="testFailOnError" - value="false"/> - <target - name="runTestEclipse" - description="Run our JUnit's within an instance of antRunner"> - <property - name="test-vm" - value="${env.JAVA_6_HOME}/bin/java"/> - - <!-- - set path to eclipse folder. If local folder, use '.'; - otherwise, use c:\path\to\eclipse or /path/to/eclipse/ - --> - <property - name="eclipse.home" - value="${testRoot}"/> - <echo - message="testTarget: ${testTarget}"/> - <!-- - can not pass in empty values in jvmargs so if not testBundle - specified, we'll pass a junk (unused) value - --> - <condition - property="testBundleParam" - value="-DtestBundle=${testBundle}" - else="-Dunused=nouse"> - <isset - property="testBundle"/> - </condition> - <echo - message="Running junits"/> - <!-- - If there is not exactly one launcher in the stack, we'd best - fail fast, since we are not expecting that, and may indicate - an installation that would produce unpredictable results - --> - <!-- - requires ant 1.7, and at this point, we're running 1.6 from - eclipse ... <condition property="expectedNumberOfLaunchers"> - <resourcecount when="equal" count="1" > <fileset - dir="${testRoot}/eclipse/plugins"> <include - name="org.eclipse.equinox.launcher_*.jar" /> </fileset> - </resourcecount> </condition> <fail message="Did not find - expected number of launcher jars. Check installation." - unless="expectedNumberOfLaunchers" /> - --> - <!-- - Remember: using dash 'debug' for org.eclipse.ant.core.antRunner - produces ant debug info to be output ... which is a TON of - stuff. Even 'verbose' is a bit too much. - --> - <echo - message="eclipse.launcher: ${eclipse.launcher}"/> - <java - taskname="unit-test-masterprocess" - fork="true" - resultProperty="wtpmasterjunitresult" - failonerror="false" - timeout="${testTimeLimit}" - dir="${testRoot}/eclipse" - jvm="${env.JAVA_6_HOME}/bin/java" - classname="org.eclipse.equinox.launcher.Main"> - <classpath> - <fileset - dir="${testRoot}/eclipse/plugins"> - <include - name="org.eclipse.equinox.launcher_*.jar"/> - </fileset> - </classpath> - <jvmarg - value="-Dosgi.ws=${env.BASEWS}"/> - <jvmarg - value="-Dosgi.os=${env.BASEOS}"/> - <jvmarg - value="-Dosgi.arch=${env.BASEARCH}"/> - <jvmarg - value="-Dws=${env.BASEWS}"/> - <jvmarg - value="-Dos=${env.BASEOS}"/> - <jvmarg - value="-Darch=${env.BASEARCH}"/> - <jvmarg - value="-DbuildBranch=${buildBranch}"/> - <jvmarg - value="-DbuildType=${buildType}"/> - <jvmarg - value="-DbuildId=${buildId}"/> - <jvmarg - value="-Dprojectname=${projectname}"/> - <jvmarg - value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/> - <jvmarg - value="${testBundleParam}"/> - <arg - value="-nosplash"/> - <arg - value="-consolelog"/> - <arg - value="-data"/> - <arg - value="${testRoot}/overallTestWorkspace"/> - <arg - value="-application"/> - <arg - value="org.eclipse.ant.core.antRunner"/> - <arg - value="-logger"/> - <arg - value="org.apache.tools.ant.DefaultLogger"/> - <arg - value="-file"/> - <arg - value="${testRoot}/test.xml"/> - <arg - value="${testTarget}"/> - - <!-- make sure our forked env has a DISPLAY --> - <env - key="DISPLAY" - value="${env.DISPLAY}"/> - <redirector - output="${testRoot}/results/fullOutput.txt" - error="${testRoot}/results/fullErrorLog.txt"/> - <jvmarg - value="-Dbuild.home=${env.BUILD_HOME}"/> - <jvmarg - value="-DbuildDirectory=${buildDirectory}"/> - <jvmarg - value="-DbuildLabel=${buildLabel}"/> - <jvmarg - value="-DbaseLocation=${baseLocation}"/> - <jvmarg - value="-DtestRoot=${testRoot}"/> - <jvmarg - value="-DtestDir=${testRoot}"/> - <jvmarg - value="-DeclipseBuilderDirectory=${pde.builder.path}"/> - </java> - <echo - message="wtpmasterjunitresult ${wtpmasterjunitresult}"/> - </target> - <target - name="postRunTestEclipse"> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results"> - <include - name="*output.txt"/> - </fileset> - </copy> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results"> - <include - name="*error.txt"/> - </fileset> - </copy> - <copy - file="${testRoot}/results/fullOutput.txt" - toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full" - overwrite="true" - failonerror="false"> - </copy> - <copy - file="${testRoot}/results/fullErrorLog.txt" - toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full" - overwrite="true" - failonerror="false"> - </copy> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/xml" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results/xml"> - <include - name="*.xml"/> - </fileset> - </copy> - <copy - todir="${buildDirectory}/${buildLabel}/testResults/html" - overwrite="true" - failonerror="false"> - <fileset - dir="${testRoot}/results/html"> - <include - name="*.html"/> - </fileset> - </copy> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/wtpjee.tests/templateFiles/index.php deleted file mode 100644 index a42c883..0000000 --- a/releng.wtpbuilder/distribution/wtpjee.tests/templateFiles/index.php +++ /dev/null
@@ -1,85 +0,0 @@ -<html> -<head> - -<?php -$parts = explode("/", realpath("..")); -$label = $parts[count($parts) - 1]; -?> - -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" - type="text/css"> -</head> -<body> -<p><b><font face="Verdana" size="+3">Test Results</font></b></p> -<table border=0 cellspacing=5 cellpadding=2 width="100%"> - <tr> - <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font - color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?> - </font></b></td> - </tr> -</table> -<p></p> -<table border="0"> -</table> - -<table width="77%" border="1"> - <tr> - <td width="81%"><b>Tests Performed</b></td> - <td width="19%"><b>Errors & Failures</b></td> - </tr> - - <? - $dir = dir("html"); - while ($anEntry = $dir->read()) - { - if ($anEntry != "." && $anEntry != "..") - { - $link = "html/".$anEntry; - $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml"; - $count = 0; - $fileHandle = fopen($xml, "r"); - while (!feof($fileHandle)) - { - $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0 - $count = $count + substr_count($aLine, '<error'); - } - fclose($fileHandle); - if ($count > 0) - { - echo "<tr><td><a href=\"$link\"><b><font color=\"red\">"; - echo "$anEntry"; - echo "</font></b></a></td>"; - echo "<td><b><font color=\"red\">$count</font></b></td></tr>"; - } - else - { - echo "<tr><td><a href=\"$link\">"; - echo "$anEntry"; - echo "</a></td>"; - echo "<td>$count</td></tr>"; - } - } - } - ?> - -</table> -<p></p> -<br> -<table border=0 cellspacing=5 cellpadding=2 width="100%"> - <tr> - <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font - color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?> - </font></b></td> - </tr> -</table> -<br> -These -<a href="consolelogs/wtptestlog.txt">logs</a> -contain the console output captured while running the JUnit automated -tests. -<br> -<br> - -</body> -</html>
diff --git a/releng.wtpbuilder/distribution/wtpjee.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/wtpjee.tests/testScripts/JUNIT.XSL deleted file mode 100644 index 9cdd80e..0000000 --- a/releng.wtpbuilder/distribution/wtpjee.tests/testScripts/JUNIT.XSL +++ /dev/null
@@ -1,703 +0,0 @@ -<xsl:stylesheet - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - <xsl:output - method="html" - indent="yes"/> - <xsl:decimal-format - decimal-separator="." - grouping-separator=","/> - <xsl:template - match="testsuites"> - <HTML> - <HEAD> - <style - type="text/css"> body { font:normal 68% - verdana,arial,helvetica; color:#000000; } table tr - td, table tr th { font-size: 68%; } table.details tr - th{ font-weight: bold; text-align:left; - background:#a6caf0; } table.details tr td{ - background:#eeeee0; } p { line-height:1.5em; - margin-top:0.5em; margin-bottom:1.0em; } h1 { - margin: 0px 0px 5px; font: 165% - verdana,arial,helvetica } h2 { margin-top: 1em; - margin-bottom: 0.5em; font: bold 125% - verdana,arial,helvetica } h3 { margin-bottom: 0.5em; - font: bold 115% verdana,arial,helvetica } h4 { - margin-bottom: 0.5em; font: bold 100% - verdana,arial,helvetica } h5 { margin-bottom: 0.5em; - font: bold 100% verdana,arial,helvetica } h6 { - margin-bottom: 0.5em; font: bold 100% - verdana,arial,helvetica } .Error { font-weight:bold; - color:red; } .Failure { font-weight:bold; - color:purple; } .Properties { text-align:right; } </style> - <script - language="JavaScript"> - var TestCases = new Array(); var cur; - <xsl:for-each - select="./testsuite"> - <xsl:apply-templates - select="properties"/> - </xsl:for-each> - </script> - <script - language="JavaScript"><![CDATA[ - function displayProperties (name) { - var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1'); - var doc = win.document.open(); - doc.write("<html><head><title>Properties of " + name + "</title>"); - doc.write("<style>") - doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }"); - doc.write("table tr td, table tr th { font-size: 68%; }"); - doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }"); - doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }"); - doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }"); - doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }"); - doc.write("</style>"); - doc.write("</head><body>"); - doc.write("<h3>Properties of " + name + "</h3>"); - doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>"); - doc.write("<table class='properties'>"); - doc.write("<tr><th>Name</th><th>Value</th></tr>"); - for (prop in TestCases[name]) { - doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>"); - } - doc.write("</table>"); - doc.write("</body></html>"); - doc.close(); - win.focus(); - } - ]]> - </script> - </HEAD> - <body> - <a - name="top"></a> - <xsl:call-template - name="pageHeader"/> - - <!-- Summary part --> - <xsl:call-template - name="summary"/> - <hr - size="1" - width="95%" - align="left"/> - - <!-- Package List part --> - <xsl:call-template - name="packagelist"/> - <hr - size="1" - width="95%" - align="left"/> - - <!-- For each package create its part --> - <xsl:call-template - name="packages"/> - <hr - size="1" - width="95%" - align="left"/> - - <!-- For each class create the part --> - <xsl:call-template - name="classes"/> - </body> - </HTML> - </xsl:template> - <!-- - ================================================================== - --> - <!-- - Write a list of all packages with an hyperlink to the anchor of - --> - <!-- - of the package name. - --> - <!-- - ================================================================== - --> - <xsl:template - name="packagelist"> - <h2>Packages</h2> - Note: package statistics are not computed recursively, they only - sum up all of its testsuites numbers. - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <xsl:call-template - name="testsuite.test.header"/> - <!-- list all packages recursively --> - <xsl:for-each - select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> - <xsl:sort - select="@package"/> - <xsl:variable - name="testsuites-in-package" - select="/testsuites/testsuite[./@package = current()/@package]"/> - <xsl:variable - name="testCount" - select="sum($testsuites-in-package/@tests)"/> - <xsl:variable - name="errorCount" - select="sum($testsuites-in-package/@errors)"/> - <xsl:variable - name="failureCount" - select="sum($testsuites-in-package/@failures)"/> - <xsl:variable - name="timeCount" - select="sum($testsuites-in-package/@time)"/> - - <!-- write a summary for the package --> - <tr - valign="top"> - <!-- set a nice color depending if there is an error/failure --> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="$failureCount > 0">Failure</xsl:when> - <xsl:when - test="$errorCount > 0">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - <td> - <a - href="#{@package}"> - <xsl:value-of - select="@package"/> - </a> - </td> - <td> - <xsl:value-of - select="$testCount"/> - </td> - <td> - <xsl:value-of - select="$errorCount"/> - </td> - <td> - <xsl:value-of - select="$failureCount"/> - </td> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="$timeCount"/> - </xsl:call-template> - </td> - </tr> - </xsl:for-each> - </table> - </xsl:template> - <!-- - ================================================================== - --> - <!-- - Write a package level report - --> - <!-- - It creates a table with values from the document: - --> - <!-- - Name | Tests | Errors | Failures | Time - --> - <!-- - ================================================================== - --> - <xsl:template - name="packages"> - <!-- create an anchor to this package name --> - <xsl:for-each - select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]"> - <xsl:sort - select="@package"/> - <a - name="{@package}"></a> - <h3> - Package - <xsl:value-of - select="@package"/> - </h3> - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <xsl:call-template - name="testsuite.test.header"/> - - <!-- match the testsuites of this package --> - <xsl:apply-templates - select="/testsuites/testsuite[./@package = current()/@package]" - mode="print.test"/> - </table> - <a - href="#top">Back to top</a> - <p/> - <p/> - </xsl:for-each> - </xsl:template> - <xsl:template - name="classes"> - <xsl:for-each - select="testsuite"> - <xsl:sort - select="@name"/> - <!-- create an anchor to this class name --> - <a - name="{@name}"></a> - <h3> - TestCase - <xsl:value-of - select="@name"/> - </h3> - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <xsl:call-template - name="testcase.test.header"/> - <!-- - test can even not be started at all (failure to load - the class) so report the error directly - --> - <xsl:if - test="./error"> - <tr - class="Error"> - <td - colspan="4"> - <xsl:apply-templates - select="./error"/> - </td> - </tr> - </xsl:if> - <xsl:apply-templates - select="./testcase" - mode="print.test"/> - </table> - <div - class="Properties"> - <a> - <xsl:attribute - name="href">javascript:displayProperties('<xsl:value-of - select="@package"/>.<xsl:value-of - select="@name"/>');</xsl:attribute> - Properties >> - </a> - </div> - <p/> - <a - href="#top">Back to top</a> - </xsl:for-each> - </xsl:template> - <xsl:template - name="summary"> - <h2>Summary</h2> - <xsl:variable - name="testCount" - select="sum(testsuite/@tests)"/> - <xsl:variable - name="errorCount" - select="sum(testsuite/@errors)"/> - <xsl:variable - name="failureCount" - select="sum(testsuite/@failures)"/> - <xsl:variable - name="timeCount" - select="sum(testsuite/@time)"/> - <xsl:variable - name="successRate" - select="($testCount - $failureCount - $errorCount) div $testCount"/> - <table - class="details" - border="0" - cellpadding="5" - cellspacing="2" - width="95%"> - <tr - valign="top"> - <th>Tests</th> - <th>Failures</th> - <th>Errors</th> - <th>Success rate</th> - <th>Time</th> - </tr> - <tr - valign="top"> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="$failureCount > 0">Failure</xsl:when> - <xsl:when - test="$errorCount > 0">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - <td> - <xsl:value-of - select="$testCount"/> - </td> - <td> - <xsl:value-of - select="$failureCount"/> - </td> - <td> - <xsl:value-of - select="$errorCount"/> - </td> - <td> - <xsl:call-template - name="display-percent"> - <xsl:with-param - name="value" - select="$successRate"/> - </xsl:call-template> - </td> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="$timeCount"/> - </xsl:call-template> - </td> - </tr> - </table> - <table - border="0" - width="95%"> - <tr> - <td - style="text-align: justify;"> - Note: - <i>failures</i> - are anticipated and checked for with assertions - while - <i>errors</i> - are unanticipated. - </td> - </tr> - </table> - </xsl:template> - <!-- - Write properties into a JavaScript data structure. This is based - on the original idea by Erik Hatcher (erik@hatcher.net) - --> - <xsl:template - match="properties"> - cur = TestCases[' - <xsl:value-of - select="../@package"/> - . - <xsl:value-of - select="../@name"/> - '] = new Array(); - <xsl:for-each - select="property"> - <xsl:sort - select="@name"/> - cur[' - <xsl:value-of - select="@name"/> - '] = ' - <xsl:call-template - name="JS-escape"> - <xsl:with-param - name="string" - select="@value"/> - </xsl:call-template> - '; - </xsl:for-each> - </xsl:template> - - <!-- Page HEADER --> - <xsl:template - name="pageHeader"> - <h1>Unit Test Results</h1> - <table - width="100%"> - <tr> - <td - align="left"></td> - <td - align="right"> - Designed for use with - <a - href='http://www.junit.org'>JUnit</a> - and - <a - href='http://jakarta.apache.org/ant'>Ant</a> - . - </td> - </tr> - </table> - <hr - size="1"/> - </xsl:template> - <xsl:template - match="testsuite" - mode="header"> - <tr - valign="top"> - <th - width="80%">Name</th> - <th>Tests</th> - <th>Errors</th> - <th>Failures</th> - <th - nowrap="nowrap">Time(s)</th> - </tr> - </xsl:template> - - <!-- class header --> - <xsl:template - name="testsuite.test.header"> - <tr - valign="top"> - <th - width="80%">Name</th> - <th>Tests</th> - <th>Errors</th> - <th>Failures</th> - <th - nowrap="nowrap">Time(s)</th> - </tr> - </xsl:template> - - <!-- method header --> - <xsl:template - name="testcase.test.header"> - <tr - valign="top"> - <th>Name</th> - <th>Status</th> - <th - width="80%">Type</th> - <th - nowrap="nowrap">Time(s)</th> - </tr> - </xsl:template> - - - <!-- class information --> - <xsl:template - match="testsuite" - mode="print.test"> - <tr - valign="top"> - <!-- set a nice color depending if there is an error/failure --> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="@failures[.> 0]">Failure</xsl:when> - <xsl:when - test="@errors[.> 0]">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - - <!-- print testsuite information --> - <td> - <a - href="#{@name}"> - <xsl:value-of - select="@name"/> - </a> - </td> - <td> - <xsl:value-of - select="@tests"/> - </td> - <td> - <xsl:value-of - select="@errors"/> - </td> - <td> - <xsl:value-of - select="@failures"/> - </td> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="@time"/> - </xsl:call-template> - </td> - </tr> - </xsl:template> - <xsl:template - match="testcase" - mode="print.test"> - <tr - valign="top"> - <xsl:attribute - name="class"> - <xsl:choose> - <xsl:when - test="failure | error">Error</xsl:when> - </xsl:choose> - </xsl:attribute> - <td> - <xsl:value-of - select="@name"/> - </td> - <xsl:choose> - <xsl:when - test="failure"> - <td>Failure</td> - <td> - <xsl:apply-templates - select="failure"/> - </td> - </xsl:when> - <xsl:when - test="error"> - <td>Error</td> - <td> - <xsl:apply-templates - select="error"/> - </td> - </xsl:when> - <xsl:otherwise> - <td>Success</td> - <td></td> - </xsl:otherwise> - </xsl:choose> - <td> - <xsl:call-template - name="display-time"> - <xsl:with-param - name="value" - select="@time"/> - </xsl:call-template> - </td> - </tr> - </xsl:template> - <xsl:template - match="failure"> - <xsl:call-template - name="display-failures"/> - </xsl:template> - <xsl:template - match="error"> - <xsl:call-template - name="display-failures"/> - </xsl:template> - - <!-- Style for the error and failure in the tescase template --> - <xsl:template - name="display-failures"> - <xsl:choose> - <xsl:when - test="not(@message)"> - N/A - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="@message"/> - </xsl:otherwise> - </xsl:choose> - <!-- display the stacktrace --> - <code> - <p/> - <xsl:call-template - name="br-replace"> - <xsl:with-param - name="word" - select="."/> - </xsl:call-template> - </code> - <!-- - the later is better but might be problematic for non-21" - monitors... - --> - <!--pre><xsl:value-of select="."/></pre--> - </xsl:template> - <xsl:template - name="JS-escape"> - <xsl:param - name="string"/> - <xsl:choose> - <!-- - something isn't right here, basically all single quotes - need to be replaced with backslash-single-quote - <xsl:when test="contains($string,''')"> - <xsl:value-of - select="substring-before($string,''')"/> \' - <xsl:call-template name="JS-escape"> <xsl:with-param - name="string" - select="substring-after($string,''')"/> - </xsl:call-template> </xsl:when> - --> - <xsl:when - test="contains($string,'\')"> - <xsl:value-of - select="substring-before($string,'\')"/> - \\ - <xsl:call-template - name="JS-escape"> - <xsl:with-param - name="string" - select="substring-after($string,'\')"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$string"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - <!-- - template that will convert a carriage return into a br tag - @param word the text from which to convert CR to BR tag - --> - <xsl:template - name="br-replace"> - <xsl:param - name="word"/> - <xsl:choose> - <xsl:when - test="contains($word,'
')"> - <xsl:value-of - select="substring-before($word,'
')"/> - <br/> - <xsl:call-template - name="br-replace"> - <xsl:with-param - name="word" - select="substring-after($word,'
')"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of - select="$word"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - <xsl:template - name="display-time"> - <xsl:param - name="value"/> - <xsl:value-of - select="format-number($value,'0.000')"/> - </xsl:template> - <xsl:template - name="display-percent"> - <xsl:param - name="value"/> - <xsl:value-of - select="format-number($value,'0.00%')"/> - </xsl:template> -</xsl:stylesheet> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtpjee.tests/testScripts/test.xml deleted file mode 100644 index e3b5f65..0000000 --- a/releng.wtpbuilder/distribution/wtpjee.tests/testScripts/test.xml +++ /dev/null
@@ -1,104 +0,0 @@ -<project - name="Automated Eclipse Testing" - default="all" - basedir="."> - <property - environment="env"/> - - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <echo - level="info" - message="starting Automated Eclipse Testing"/> - <echo - level="info" - message="ant file basedir: ${basedir}"/> - <echo - level="info" - message="testRoot: ${testRoot}"/> - <fail - message="testRoot must be set" - unless="testRoot"/> - - <!--properties file containing the build information--> - <property - file="${buildDirectory}/label.properties"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - - <!-- - name that can be added to report name to identify which platform - tests results come from - --> - <property - name="platform" - value=""/> - - <!-- TODO: The framework apps might need this. But we should elmimnate if posslbe. --> - <property - name="eclipse-home" - value="${testRoot}"/> - <!-- - The directory that will contain the xml and html results from - the tests that are run - --> - <property - name="results" - value="${testRoot}/results"/> - <property - name="library-file" - value="${testRoot}/wtp-junit-tests.xml"/> - <target - name="init"> - </target> - <target - name="all" - depends="init"> - <echo - level="info" - message="Starting Unit Tests"/> - <!-- - unlike other ant tasks, subant defaults to false for - inheritall! - --> - <subant - target="" - inheritall="true"> - <fileset - dir="${testRoot}${dropinsFolder}/eclipse/plugins/"> - <exclude - name="**/*performance*/test.xml"/> - <include - name="**/test.xml"/> - </fileset> - </subant> - <echo - level="info" - message="Ended Unit Tests"/> - <antcall - target="genHtml"/> - </target> - <target - name="genHtml" - description="Generates HTML results with provided JUNIT.XSL provided" - unless="genHtml.disable"> - <xslt - style="JUNIT.XSL" - basedir="${results}/xml" - destdir="${results}/html"/> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtpjee.tests/testScripts/wtp-junit-tests.xml deleted file mode 100644 index 938e9cd..0000000 --- a/releng.wtpbuilder/distribution/wtpjee.tests/testScripts/wtp-junit-tests.xml +++ /dev/null
@@ -1,318 +0,0 @@ -<?xml version="1.0"?> -<project - name="JUnit tests" - basedir="."> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <property - file="${keyCfgFile}"/> - <target - name="init"> - <property - name="junit-report-output" - value="${testRoot}/results"/> - <mkdir - 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". - --> - <property - name="extraVMargs" - value="-DextraVMargsunused=notused"/> - - <!-- if not otherwise set, use a unique workspace name --> - <property - name="data-dir" - value="${testRoot}/junitworkspaces/workspace-${classname}"/> - - <!-- - 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" - value="1800000"/> - <property - name="junit-report-output" - value="${junit-report-output}"/> - <property - name="formatter" - value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/> - <property - name="test-output" - value="${junit-report-output}/raw/${classname}.xml"/> - <property - name="jvm" - value="${env.JAVA_6_HOME}/bin/java"/> - <dirname - file="${ant.file}" - property="currentDir"/> - <echo - level="info" - message="data-dir: ${data-dir}"/> - <echo - level="info" - message="plugin-name: ${plugin-name}"/> - <echo - level="info" - message="classname: ${classname}"/> - <echo - level="info" - message="extraVMargs: ${extraVMargs}"/> - <echo - level="info" - message="timeout: ${timeout}"/> - <echo - level="info" - message="testRoot: ${testRoot}"/> - <echo - level="info" - message="ant file basedir: ${basedir}"/> - <echo - level="info" - message="junit-report-output: ${junit-report-output}"/> - <echo - level="info" - message="test-output: ${test-output}"/> - <echo - level="info" - message="buildDirectory: ${buildDirectory}"/> - <echo - level="info" - message="buildLabel: ${buildLabel}"/> - <echo - level="info" - message="jvm: ${jvm}"/> - </target> - <target - name="core-test" - depends="init"> - <echo - level="info" - message="test-type: core-test"/> - <ant - antfile="${ant.file}" - dir="${currentDir}" - target="eclipse-test"> - <property - name="application" - value="org.eclipse.test.coretestapplication"/> - </ant> - </target> - <target - name="ui-test" - depends="init"> - <echo - level="info" - message="test-type: ui-test"/> - <ant - antfile="${ant.file}" - dir="${currentDir}" - target="eclipse-test"> - <property - name="application" - value="org.eclipse.test.uitestapplication"/> - </ant> - </target> - <target - name="eclipse-test" - description="Runs the specified classname as a plug-in test."> - <echo - level="info" - message="Running ${classname}"/> - <echo - level="info" - message="Result file: ${junit-report-output}/${classname}.xml."/> - <echo - level="info" - message="DISPLAY: ${env.DISPLAY}"/> - <mkdir - dir="${junit-report-output}/httplogstest"/> - <echo - message="http log messages to: ${junit-report-output}/httplogstest"/> - <condition - property="xulRunnerParam" - value="org.eclipse.swt.browser.XULRunnerPath" - else="XULRunnerPathNotSpecified"> - <isset - property="env.WTP_XULRUNNER"/> - </condition> - <echo - 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 - an installation that would produce unpredictable results - --> - <!-- - requires ant 1.7, and at this point, we're running 1.6 from - eclipse ... <condition property="expectedNumberOfLaunchers"> - <resourcecount when="equal" count="1" > <fileset - dir="${testRoot}/eclipse/plugins"> <include - name="org.eclipse.equinox.launcher_*.jar" /> </fileset> - </resourcecount> </condition> <fail message="Did not find - expected number of launcher jars. Check installation." - unless="expectedNumberOfLaunchers" /> - --> - <java - taskname="suiteUnitTest" - fork="true" - resultProperty="suitejunitresult" - failonerror="false" - timeout="${timeout}" - dir="${testRoot}/eclipse" - jvm="${jvm}" - classname="org.eclipse.equinox.launcher.Main"> - <classpath> - <fileset - dir="${testRoot}/eclipse/plugins"> - <include - name="org.eclipse.equinox.launcher_*.jar"/> - </fileset> - </classpath> - <jvmarg - value="-Xmx256m"/> - <jvmarg - value="-Xverify"/> - <jvmarg - value="-Dosgi.ws=${env.BASEWS}"/> - <jvmarg - value="-Dosgi.os=${env.BASEOS}"/> - <jvmarg - value="-Dosgi.arch=${env.BASEARCH}"/> - <jvmarg - value="-DbuildLabel=${buildLabel}"/> - <jvmarg - value="-DbuildDirectory=${buildDirectory}"/> - <jvmarg - value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/> - <jvmarg - value="-DurlLogLocation=${junit-report-output}/httplogstest/outgoinghttplog-${plugin-name}.log"/> - <jvmarg - value="-Dwtp.autotest.noninteractive=true"/> - <jvmarg - line="${extraVMargs}"/> - <jvmarg - value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/> - <jvmarg - value="-Dprojectname=${projectname}"/> - <jvmarg - value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> - <arg - value="-nosplash"/> - <arg - value="-consolelog"/> - <arg - value="-debug"/> - <arg - value="-data"/> - <arg - value="${data-dir}"/> - <arg - value="-application"/> - <arg - value="${application}"/> - <arg - value="formatter=${formatter},${test-output}"/> - <arg - value="-testPluginName"/> - <arg - value="${plugin-name}"/> - <arg - value="-className"/> - <arg - value="${classname}"/> - <env - key="DISPLAY" - value="${env.DISPLAY}"/> - <redirector - output="${junit-report-output}/${classname}.output.txt" - error="${junit-report-output}/${classname}.error.txt"/> - </java> - <echo - level="info" - message="suitejunitresult: ${suitejunitresult}"/> - <antcall - target="summarizeFailure"/> - <antcall - target="collect-results"/> - </target> - <target - name="collect-results"> - <dirname - property="output-dir" - file="${test-output}"/> - <basename - property="output-file-name" - file="${test-output}"/> - <mkdir - dir="${junit-report-output}/xml"/> - <junitreport - todir="${junit-report-output}/xml" - tofile="${classname}.xml"> - <fileset - dir="${output-dir}"> - <include - name="${output-file-name}"/> - </fileset> - </junitreport> - <mkdir - dir="${junit-report-output}/html"/> - <xslt - style="${testRoot}/JUNIT.XSL" - basedir="${junit-report-output}" - includes="${classname}.xml" - destdir="${junit-report-output}/html"/> - </target> - <target - name="collect"> - <!-- - deprecated, each test.xml uses it, and we should remove, - eventually - --> - <echo - message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/> - </target> - <target - name="summarizeFailure" - depends="checkFailure" - if="doFailure"> - <!-- TODO: fix sdo junitFailureList.log goes in 'results', at first. Then copied. Then coordinate with releng scripts --> - <echo - append="true" - file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo> - </target> - <target - name="checkFailure"> - <condition - property="doFailure"> - <not> - <equals - arg1="${suitejunitresult}" - arg2="0" - trim="true"/> - </not> - </condition> - </target> -</project> \ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtpjee.tests/testdependency.xml deleted file mode 100644 index 02cd091..0000000 --- a/releng.wtpbuilder/distribution/wtpjee.tests/testdependency.xml +++ /dev/null
@@ -1,278 +0,0 @@ -<?xml version="1.0"?> - <!-- - ====================================================================== - Properties that must be passed to this script: base.install.dir - dependencyTargets local.cache.dir dependency.properties - ====================================================================== - --> -<project - name="test" - default="get"> - <property - environment="env"/> - <!-- required to get proper value of dropinsFolder --> - <property - name="keyCfgFile" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/> - <echo - level="info" - message="keyCfgFile: ${keyCfgFile}"/> - <fail - message="Required property file does not exist: ${keyCfgFile}"> - <condition> - <not> - <available - file="${keyCfgFile}"/> - </not> - </condition> - </fail> - <property - file="${keyCfgFile}"/> - <condition - property="getprereq.eclipse"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.eclipseplatform"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.emf"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.emfxsd"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.emfvalidation"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.gef"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.dtp"> - <istrue - value="true"/> - </condition> - <condition - property="getprereq.wst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.jst"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.wtp"> - <istrue - value="false"/> - </condition> - <condition - property="getprereq.dltk"> - <istrue - value="false"/> - </condition> - <target - name="get"> - <!-- - read in this properties, just so we can make sure our - requested pre-reqs are defined, which we do later with - statements such if="${groupId}.url" - --> - <property - file="${dependency.properties}"/> - <antcall - target="prereq.emf"/> - <antcall - target="prereq.emfxsd"/> - <antcall - target="prereq.emfvalidation"/> - <antcall - target="prereq.gef"/> - <antcall - target="prereq.dtp"/> - <antcall - target="prereq.wst"/> - <antcall - target="prereq.jst"/> - <antcall - target="prereq.wtp"/> - <antcall - target="prereq.dltk"/> - <antcall - target="getAndInstallBase"> - <param - name="groupId" - value="eclipse"/> - </antcall> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="eclipseTestFramework"/> - </antcall> - </target> - <target - name="prereq.eclipse" - if="getprereq.eclipse"> - <antcall - target="getAndInstallBase"> - <param - name="groupId" - value="eclipse"/> - </antcall> - </target> - <target - name="prereq.eclipseplatform" - if="getprereq.eclipseplatform"> - <antcall - target="getAndInstallBase"> - <param - name="groupId" - value="eclipseplatform"/> - </antcall> - </target> - <target - name="prereq.emf" - if="getprereq.emf"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="emf"/> - </antcall> - </target> - <target - name="prereq.emfxsd" - if="getprereq.emfxsd"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="emfxsd"/> - </antcall> - </target> - <target - name="prereq.emfvalidation" - if="getprereq.emfvalidation"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="emfvalidation"/> - </antcall> - </target> - <target - name="prereq.gef" - if="getprereq.gef"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="gef"/> - </antcall> - </target> - <target - name="prereq.dtp" - if="getprereq.dtp"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="dtp"/> - </antcall> - </target> - <target - name="prereq.wst" - if="getprereq.wst"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="wst"/> - </antcall> - </target> - <target - name="prereq.jst" - if="getprereq.jst"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="jst"/> - </antcall> - </target> - <target - name="prereq.wtp" - if="getprereq.wtp"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="wtp"/> - </antcall> - </target> - <target - name="prereq.dltk" - if="getprereq.dltk"> - <antcall - target="getAndInstallDropins"> - <param - name="groupId" - value="dltk"/> - </antcall> - </target> - <target - name="getAndInstallBase" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}"/> - </ant> - </target> - <target - name="getAndInstallDropins" - if="${groupId}.url"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}"/> - </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}"/> - <property - name="install.destination" - value="${base.install.dir}${dropinsFolder}"/> - </ant> - </target> -</project> \ No newline at end of file