Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-03-22 22:18:05 +0000
committerDavid Williams2015-03-22 22:18:05 +0000
commit9e8660460feb416c9bca393dea1919aa99c10c1d (patch)
tree5b6a7a403e725748a19c108d791c3f3156a8bc14
parent9ac444b64aabf1d18fa5532558d6cd0f579617b1 (diff)
downloadeclipse.platform.releng.aggregator-9e8660460feb416c9bca393dea1919aa99c10c1d.tar.gz
eclipse.platform.releng.aggregator-9e8660460feb416c9bca393dea1919aa99c10c1d.tar.xz
eclipse.platform.releng.aggregator-9e8660460feb416c9bca393dea1919aa99c10c1d.zip
Bug 461678 - Modify JUnit test framework to work with "Mac App" form
-rw-r--r--production/testScripts/runTests2.xml489
-rwxr-xr-xproduction/testScripts/test_runTests2.xml.sh9
2 files changed, 232 insertions, 266 deletions
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index ed161e2a..ee14e9eb 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -15,12 +15,9 @@
<property
name="selectiveVerbose"
value="false" />
- <!--
- If not explicitly passed in from caller, assume 'all'.
- This is the default target already, in global test.xml,
- but this allows us to be explicit (and, make sure it
- continues working).
- -->
+ <!-- If not explicitly passed in from caller, assume 'all'. This is the
+ default target already, in global test.xml, but this allows us to be explicit
+ (and, make sure it continues working). -->
<condition
property="testSuite"
value="${env.testSuite}"
@@ -31,7 +28,8 @@
name="buildURL"
value="http://${DOWNLOAD_HOST}/eclipse/downloads/${dropsDirSegment}/${buildId}" />
- <!-- we'll check "alt" baselinePerf first. This is what's used for "several releases ago", or similar. -->
+ <!-- we'll check "alt" baselinePerf first. This is what's used for "several
+ releases ago", or similar. -->
<condition
property="buildIdToUse"
value="${baselinePerfAltVersionLabel}">
@@ -42,8 +40,8 @@
value="${baselinePerfAltLocation}">
<istrue value="${baselinePerfAlt}" />
</condition>
- <!-- if 'baselinePerf' is specified, need to it for "buildId", plus adjust URL to it, not what we just built. Only "tests" always
- get buildURL -->
+ <!-- if 'baselinePerf' is specified, need to it for "buildId", plus adjust
+ URL to it, not what we just built. Only "tests" always get buildURL -->
<condition
property="buildIdToUse"
value="${baselinePerfVersionLabel}"
@@ -59,8 +57,8 @@
<property
name="eclipse.perf.dbloc"
value="${eclipse.perf.dbloc.value}" />
- <!-- TODO: Do we need "buildID" coded somewhere, to know WHICH build to match with?
- Or, else will take large number of "baselines" averaged? -->
+ <!-- TODO: Do we need "buildID" coded somewhere, to know WHICH build to
+ match with? Or, else will take large number of "baselines" averaged? -->
<condition
property="eclipse.perf.config"
value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
@@ -72,15 +70,14 @@
else="build=${buildId};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
<istrue value="${baselinePerf}" />
</condition>
- <!--
- This "assert" property works, in this context, because we run baseline first,
- when buildIdToUse != buildId that is a "baseline run" (so, no "assert" for that baseline run).
- But, when buildIdToUse == buildId that is a "normal run" so then we do want to "assert" against the already-collected baseline
- data.
- Note: Note, docs say order does not matter, and could specify "just build" and reset filled in with what's in 'config', but some
- experiences makes me doubt that?
- TODO: design problem: how to distinguish assert against baseline vs. baseline alt.
- -->
+ <!-- This "assert" property works, in this context, because we run baseline
+ first, when buildIdToUse != buildId that is a "baseline run" (so, no "assert"
+ for that baseline run). But, when buildIdToUse == buildId that is a "normal
+ run" so then we do want to "assert" against the already-collected baseline
+ data. Note: Note, docs say order does not matter, and could specify "just
+ build" and reset filled in with what's in 'config', but some experiences
+ makes me doubt that? TODO: design problem: how to distinguish assert against
+ baseline vs. baseline alt. -->
<condition
property="eclipse.perf.assertAgainst"
value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};">
@@ -88,7 +85,7 @@
arg1="${buildIdToUse}"
arg2="${buildId}" />
</condition>
- <!-- frameworkperfargs is used by library.xml ... probably an easier way? -->
+ <!-- frameworkperfargs is used by library.xml ... probably an easier way? -->
<condition
property="frameworkperfargs"
value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}"
@@ -114,17 +111,13 @@
<echo message="testSuite: ${testSuite}" />
- <!--
- there's nothing "automatic" about the local cache (so far).
- If specified (such as on Hudson command line that executes this
- file, as, say,
- -DlocalCache=file:///shared/eclipse/localCache
- then all the downloads required must be already available there.
- It is intended to speed up local testing to avoid re-downloading
- files.
- -->
- <!-- currently, following is dead code. Leaving for now as a reminder to allow localCache again, someday -->
- <condition
+ <!-- there's nothing "automatic" about the local cache (so far). If specified
+ (such as on Hudson command line that executes this file, as, say, -DlocalCache=file:///shared/eclipse/localCache
+ then all the downloads required must be already available there. It is intended
+ to speed up local testing to avoid re-downloading files. -->
+ <!-- currently, following is dead code. Leaving for now as a reminder to
+ allow localCache again, someday -->
+ <condition
property="archiveLocation"
value="${localCache}"
else="${buildURL}">
@@ -398,18 +391,17 @@
<echo message="[INFO] in runTest2.xml: testPlatform ${testPlatform}" />
</target>
- <!--
- Note that in getting the target platform, we nearly always get the 'buildId' version,
- the one we just built. But, in some cases, we use "baselinePerf" version for performance
- regression testing. In that case, we still get the "buildId" version of tests ... the ones
- we just built ... only what we run them on changes.
- When we do use 'baselinePerf', that is specified as 'true' in Hudson job, which signals
- to use the baselinePerf version defined in 'streamSpecific.properties.
- -->
+ <!-- Note that in getting the target platform, we nearly always get the
+ 'buildId' version, the one we just built. But, in some cases, we use "baselinePerf"
+ version for performance regression testing. In that case, we still get the
+ "buildId" version of tests ... the ones we just built ... only what we run
+ them on changes. When we do use 'baselinePerf', that is specified as 'true'
+ in Hudson job, which signals to use the baselinePerf version defined in 'streamSpecific.properties. -->
<target
name="downloadTargetPlatform"
depends="init">
- <!-- TODO: should add checks for checksum integrity on downloads. Perhaps use mirror URLs? (though, that'd not effect production) -->
+ <!-- TODO: should add checks for checksum integrity on downloads. Perhaps
+ use mirror URLs? (though, that'd not effect production) -->
<fail
unless="testPlatform"
message="testPlatform did not match any of the supported combinations of osgi.os, osgi.ws, osgi.arch" />
@@ -441,15 +433,8 @@
arg1="${testPlatform}"
arg2="linux32" />
</condition>
- <!--
- <condition
- property="getArtifacts"
- value="getmaczips">
- <equals
- arg1="${testPlatform}"
- arg2="macmini" />
- </condition>
- -->
+ <!-- <condition property="getArtifacts" value="getmaczips"> <equals arg1="${testPlatform}"
+ arg2="macmini" /> </condition> -->
<condition
property="getArtifacts"
value="getmacosx">
@@ -488,8 +473,7 @@
<copy
todir="${executionDir}"
verbose="true">
- <fileset
- dir="${configurationDir}/sdk.tests/testConfigs/${testPlatform}" />
+ <fileset dir="${configurationDir}/sdk.tests/testConfigs/${testPlatform}" />
</copy>
<copy
verbose="true"
@@ -502,37 +486,29 @@
description="Echo all properties in runTest2 after all is initialized, shortly before tests are ran."
destfile="${WORKSPACE}/propertiesAllFromRunTest2.properties" />
- <!--
- TODO: seems this unzip could/should be moved to test.xml? To do once only,
- of course, if not already done.
- We (sort of) do in test.xml. See its setupRepo task.
- -->
+ <!-- TODO: seems this unzip could/should be moved to test.xml? To do once
+ only, of course, if not already done. We (sort of) do in test.xml. See its
+ setupRepo task. -->
<property
name="repoZip"
value="${executionDir}/eclipse-junit-tests-${buildId}.zip" />
<echo message="repoZip: ${repoZip}" />
<antcall target="unzipTestFramework" />
- <!--
- We print these properties to a file primarily to capture variables that
- might have been set in Hudson, which do not "survive" going through the
- bat or script files. ... Though, makes me wonder if we really need to do that?
- Seems we could call test.xml directly?
- In principle, we could call printProperty from anywhere,
- but seems best to centralize the function.
- -->
+ <!-- We print these properties to a file primarily to capture variables
+ that might have been set in Hudson, which do not "survive" going through
+ the bat or script files. ... Though, makes me wonder if we really need to
+ do that? Seems we could call test.xml directly? In principle, we could call
+ printProperty from anywhere, but seems best to centralize the function. -->
<antcall target="printProductionProperties" />
- <!--
- The PHP properties are useful to display (directly or indirectly)
- on "test results" page (such as "testPlatform" headings).
- -->
+ <!-- The PHP properties are useful to display (directly or indirectly)
+ on "test results" page (such as "testPlatform" headings). -->
<antcall target="printMainPropertiesAsPHP" />
- <!--
- following are all required by "runtests" ... used to be part of it, but wanted these
- variables to print out, even if merely testing scripts, but not actually running tests.
- -->
+ <!-- following are all required by "runtests" ... used to be part of it,
+ but wanted these variables to print out, even if merely testing scripts,
+ but not actually running tests. -->
<condition
property="executionArguments"
value="/c ${testScript}">
@@ -563,14 +539,12 @@
<target
name="printProductionProperties"
depends="init">
- <!--
- here we want to print properties, such as passed in via Hudson,
- that can be used later, by test.xml, but since it is started by as separate
- processes, there is no direct access to Hudson properties ...
- so we make them persistent. In many cases, the property will not be defined,
- in which case we do not want to write anything for that property (or, it
- will appear to have been set, even if set to an empty string).
- -->
+ <!-- here we want to print properties, such as passed in via Hudson, that
+ can be used later, by test.xml, but since it is started by as separate processes,
+ there is no direct access to Hudson properties ... so we make them persistent.
+ In many cases, the property will not be defined, in which case we do not
+ want to write anything for that property (or, it will appear to have been
+ set, even if set to an empty string). -->
<printProperty property="buildId" />
<printProperty property="buildIdToUse" />
@@ -604,25 +578,95 @@
<printProperty property="eclipse.perf.config" />
<printProperty property="eclipse.perf.assertAgainst" />
- <!--
- The following will leave pw in file, which is not a lot different that
- leave them printed in log, as we also do. But, could be improved by just leaving
- filename in properties, and reading them in at the time needed in test.xml.
- -->
+ <!-- The following will leave pw in file, which is not a lot different
+ that leave them printed in log, as we also do. But, could be improved by
+ just leaving filename in properties, and reading them in at the time needed
+ in test.xml. -->
<printProperty property="cvstest.properties" />
+ </target>
+
+ <target
+ name="initStreamSpecificProperties"
+ unless="streamSpecificPropertiesSet">
+ <!-- Note: configurationDir is set by runTest2.xml in 'production' environment.
+ Here we will set to basedir, if not already set. But, this file, streamSpecific.properties
+ should always be optional. TODO: better document what is in that file. -->
+ <property
+ name="configurationDir"
+ value="basedir" />
+ <property file="${configurationDir}/streamSpecific.properties" />
+ <property
+ name="streamSpecificPropertiesSet"
+ value="true" />
+ </target>
+
+ <target
+ name="checkInstallDir"
+ if="install">
+ <echo message="[DEBUG] in test.xml: Found the value of install already set, to ${install}" />
+ </target>
+
+ <target
+ name="initInstallDir"
+ depends="initBuildId, initStreamSpecificProperties, checkInstallDir"
+ unless="install">
+ <property
+ name="testDir"
+ value="${WORKSPACE}/workarea/${buildId}" />
+ <echo message="[DEBUG] in test.xml: testDir: ${testDir}" />
+
+ <property
+ name="executionDir"
+ value="${testDir}/eclipse-testing" />
+ <mkdir dir="${executionDir}" />
+ <echo message="[DEBUG] in test.xml: executionDir: ${executionDir}" />
+
+ <!--default directory where test-eclipse-sdk will be installed -->
+ <property
+ name="install"
+ value="${executionDir}/test-eclipse" />
+ <mkdir dir="${install}" />
+ <echo message="[DEBUG] in test.xml: the value of install was set to: ${{install}" />
+ </target>
+
+ <!-- eclipse-home set to be the folder that will later contain the plugins
+ folder. Note: we have to set eclipse-home, rather than use "eclpse.home"
+ or "eclipse.home.location" because at this point we are executing from the
+ "setup" version of eclipse (aka basebuilder) not the actual version of eclipse
+ we will later be testing. -->
+ <target
+ name="initEclipseHome"
+ depends="initStreamSpecificProperties, initInstallDir, checkEclipseHome"
+ unless="eclipse-home">
+
+ <condition
+ property="eclipse-home"
+ value="${install}/Eclipse.app/Contents/Eclipse"
+ else="${install}/eclipse">
+ <and>
+ <os family="mac" />
+ <istrue value="${isMacAppLayout}" />
+ </and>
+ </condition>
+ <echo message="[DEBUG] the value of eclipse-home was set to: ${eclipse-home}" />
+ </target>
+ <!-- Intended to be called only from initEclipseHome, simply as extra information
+ for debugging -->
+ <target
+ name="checkEclipseHome"
+ if="eclipse-home">
+ <echo message="[DEBUG] Found the value of eclipse-home already set, to ${eclipse-home}" />
</target>
<macrodef name="printProperty">
- <!-- the use of properyfile and local require at least Ant 1.8 -->
+ <!-- the use of properyfile and local require at least Ant 1.8 -->
<attribute name="property" />
<sequential>
<echo message="DEBUG @{property}: ${@{property}}" />
- <!--
- for our use, 'del' operation won't typically delete anything,
- since would not have been there to begin with, but is an easy way to
- prevent an undefined property from being written
- -->
+ <!-- for our use, 'del' operation won't typically delete anything, since
+ would not have been there to begin with, but is an easy way to prevent an
+ undefined property from being written -->
<local name="oper" />
<condition
property="oper"
@@ -640,33 +684,28 @@
</macrodef>
- <!--
- This initStreamSpecificVariables target was copied from buildAll.xml and does about exactly the same thing,
- purposely left close to original, though not as much is actually required.
- TODO: in future, pull out into one file, and reuse
- You can tell from comment, it is out dated.
-
- Its purpose, here, is entirely to pick up "stream specific" stings from the releng maps
- project, 'configuration' folder.
-
- Important note: here, unlike the one in buildAll.xml, we assume the maps have already
- been checked out, say by Hudson, as a peer of eclipseBuilder, rather then us doing
- the checkout here, ourselves. Not sure which is easier, but current means Hudson job
- has to be set up with two git checkout steps, right version for maps (for 3.8 vs 4.2).
- -->
+ <!-- This initStreamSpecificVariables target was copied from buildAll.xml
+ and does about exactly the same thing, purposely left close to original,
+ though not as much is actually required. TODO: in future, pull out into one
+ file, and reuse You can tell from comment, it is out dated. Its purpose,
+ here, is entirely to pick up "stream specific" stings from the releng maps
+ project, 'configuration' folder. Important note: here, unlike the one in
+ buildAll.xml, we assume the maps have already been checked out, say by Hudson,
+ as a peer of eclipseBuilder, rather then us doing the checkout here, ourselves.
+ Not sure which is easier, but current means Hudson job has to be set up with
+ two git checkout steps, right version for maps (for 3.8 vs 4.2). -->
<target
name="initStreamSpecificVariables"
unless="initStreamSpecificVariablesComplete"
depends="initWorkspace,initBuildType, initStreamVariables,initDownloadHosts">
<echo message="DEBUG: executing initStreamSpecificVariables" />
- <!--
- these conditions used to be in "init". Conceptually seems right to be in "stream
- specific" init (since their value depends on stream) but may have side effects?).
- This is really no longer relevant, as everything we build/tests comes from
- "drops4" ... but will leave in case we ever have a "drops5" ... or, have to
- back port tests to re-test 3.8! (Which, we probably do, for 3.8?)
- -->
+ <!-- these conditions used to be in "init". Conceptually seems right to
+ be in "stream specific" init (since their value depends on stream) but may
+ have side effects?). This is really no longer relevant, as everything we
+ build/tests comes from "drops4" ... but will leave in case we ever have a
+ "drops5" ... or, have to back port tests to re-test 3.8! (Which, we probably
+ do, for 3.8?) -->
<condition
property="dropsDirSegment"
value="drops4"
@@ -678,10 +717,10 @@
<loadproperties srcFile="${configurationDir}/streamSpecific.properties" />
- <!-- echo a few typically expected properties, to make sure getting right file -->
+ <!-- echo a few typically expected properties, to make sure getting right
+ file -->
- <echo
- message="streamSpecificPropertiesTitle: ${streamSpecificPropertiesTitle}" />
+ <echo message="streamSpecificPropertiesTitle: ${streamSpecificPropertiesTitle}" />
<echo message="previousReleaseLocation: ${previousReleaseLocation}" />
<echo message="previousReleaseVersion: ${previousReleaseVersion}" />
@@ -692,17 +731,15 @@
value="true" />
</target>
- <!--
- DOWNLOAD_HOST and ARCHIVE_HOST can be defined on command line,
- if running on local test environments.
- -->
+ <!-- DOWNLOAD_HOST and ARCHIVE_HOST can be defined on command line, if running
+ on local test environments. -->
<target
name="initDownloadHosts"
unless="DOWNLOAD_HOST">
- <!-- we assume if "DOWNLOAD_HOST" is defined, then ARCHIVE_HOST has been defined also. -->
+ <!-- we assume if "DOWNLOAD_HOST" is defined, then ARCHIVE_HOST has been
+ defined also. -->
<property environment="env" />
- <echo
- message="DEBUG: Found DOWNLOAD_HOST not defined. Setting in 'initDownloadHosts'" />
+ <echo message="DEBUG: Found DOWNLOAD_HOST not defined. Setting in 'initDownloadHosts'" />
<echo message="DEBUG: env.DOWNLOAD_HOST: ${env.DOWNLOAD_HOST}" />
<condition
property="DOWNLOAD_HOST"
@@ -734,7 +771,7 @@
<target
name="initBuildId"
unless="buildId">
- <!--property file that can contain the buildId, if not otherwise set -->
+ <!--property file that can contain the buildId, if not otherwise set -->
<property file="label.properties" />
<fail
unless="buildId"
@@ -746,10 +783,8 @@
<fail
unless="buildId"
message="buildId value must be provided by caller (such as 'I20120717-0800'" />
- <!--
- this "buildId check" may be overly strict, but best to start off strict for now,
- loosen in future if we start to find/have variety
- -->
+ <!-- this "buildId check" may be overly strict, but best to start off strict
+ for now, loosen in future if we start to find/have variety -->
<condition property="buildIdOK">
<matches
pattern="^[IMXYNPSR]\d{8}-\d{4}$"
@@ -773,10 +808,9 @@
<fail unless="buildType" />
</target>
- <!--
- main purpose of initStreamVariables, it to be sure we have eclipseStreamMajor and eclipseStreamMinor
- Uses script, which requires Java 1.6 (or ... else gets complicated to setup)
- -->
+ <!-- main purpose of initStreamVariables, it to be sure we have eclipseStreamMajor
+ and eclipseStreamMinor Uses script, which requires Java 1.6 (or ... else
+ gets complicated to setup) -->
<target
name="initStreamVariables"
unless="streamVariablesInitialized">
@@ -816,11 +850,9 @@
<fail
unless="eclipseStreamMinor"
message="eclipseStreamMinor not defined or computable" />
- <!-- eclipseStreamService may not always be defined? And we do not currently use it.
- <fail
- unless="eclipseStreamService"
- message="eclipseStreamService not defined or computable" />
- -->
+ <!-- eclipseStreamService may not always be defined? And we do not currently
+ use it. <fail unless="eclipseStreamService" message="eclipseStreamService
+ not defined or computable" /> -->
<fail
unless="updateSiteSegment"
message="updateSiteSegment not defined or computable" />
@@ -832,101 +864,54 @@
<target
name="initBasicDirectories"
- depends="initWorkspace,initBuildId,initPlatformSpecificProperties,setJavaMajorVersion"
+ depends="initWorkspace,initBuildId, initStreamSpecificProperties, initEclipseHome"
unless="basicDirectoriesInitialized">
- <property
- name="relengBaseBuilderDir"
- value="${WORKSPACE}/org.eclipse.releng.basebuilder" />
- <property
- name="configurationDir"
- value="${WORKSPACE}/eclipse.platform.releng.aggregator/production/testScripts/configuration" />
+ <property environment="env" />
<property
- name="testDir"
- value="${WORKSPACE}/workarea/${buildId}" />
- <echo message="testDir: ${testDir}" />
+ name="repoZip"
+ value="${executionDir}/eclipse-junit-tests-${buildId}.zip" />
+ <echo message="repoZip: ${repoZip}" />
<property
- name="executionDir"
- value="${testDir}/eclipse-testing" />
- <mkdir dir="${executionDir}" />
- <echo message="executionDir: ${executionDir}" />
+ name="repoLocation"
+ value="${executionDir}/testRepo" />
+ <echo message="repoLocation: ${repoLocation}" />
+
<property
- name="testedPlatformConfig"
- value="${osgi.os}.${osgi.ws}.${osgi.arch}" />
- <property
- name="testedPlatform"
- value="${osgi.os}.${osgi.ws}.${osgi.arch}_${javaMajorVersion}" />
+ name="platformLocation"
+ value="${executionDir}/platformLocation" />
+ <mkdir dir="${platformLocation}" />
+ <echo message="platformLocation: ${platformLocation}" />
- <!-- The directory that will contain all files containing information on the tests that ran. -->
+ <!-- The directory that will contain all files containing information on
+ the tests that ran. -->
<property
name="results"
value="${executionDir}/results" />
-
<mkdir dir="${results}" />
<mkdir dir="${results}/xml" />
<mkdir dir="${results}/html" />
<echo message="results: ${results}" />
-
- <!--Directory for JUnit report output, console log output and .log content for each test suite.
- Overrides default in org.eclipse.test/library.xml -->
+ <!--Directory for JUnit report output, console log output and .log content
+ for each test suite. Overrides default in org.eclipse.test/library.xml -->
<property
name="junit-report-output"
value="${results}/${testedPlatform}" />
<mkdir dir="${junit-report-output}" />
<echo message="junit-report-output: ${junit-report-output}" />
- <!--default directory where test-eclipse-sdk will be installed -->
- <property
- name="install"
- value="${executionDir}/test-eclipse" />
- <mkdir dir="${install}" />
- <echo message="install: ${install}" />
-
-
- <!--
- For the context of this script eclipse-home is actually
- set to be the folder containing the plugins folder
- -->
- <condition
- property="eclipse-home"
- value="${install}/Eclipse.app/Contents/Eclipse"
- else="${install}/eclipse">
- <and>
- <os family="mac" />
- <istrue value="${isMacAppLayout}" />
- </and>
- </condition>
- <mkdir dir="${eclipse-home}" />
- <echo message="eclipse-home: ${eclipse-home}" />
-
- <property
- name="repoLocation"
- value="${executionDir}/testRepo" />
- <echo message="repoLocation: ${repoLocation}" />
-
- <!--
- mostly putting previous platform here, since p2 looks for exactly one
- occurrence of "platform-eclipse-" under executionDir, and if it finds two,
- it won't "find" any.
- -->
- <property
- name="platformLocation"
- value="${executionDir}/platformLocation" />
- <mkdir dir="${platformLocation}" />
- <echo message="platformLocation: ${platformLocation}" />
-
<property
name="directorLogs"
- value="${executionDir}/directorLogs" />
+ value="${results}/${testedPlatform}/directorLogs" />
<mkdir dir="${directorLogs}" />
<echo message="directorLogs: ${directorLogs}" />
- <!-- this directory, with some sort files are created during unit tests
- ... need to find where to disable/enable JaCoCo -->
+ <!-- this directory, with some sort files are created during unit tests
+ ... need to find where to disable/enable JaCoCo -->
<property
name="coverage-output"
value="${results}/coverageIGNORE" />
@@ -936,14 +921,10 @@
value="true" />
<echo message="basicDirectoriesInitialized" />
</target>
-
- <!--
- This task unzips the test framework that was built.
- It includes misc. files, the Test Framework proper, and
- a zipped up repo of the unit tests.
- We also do this in "testAll" scripts ...?
- TODO: investigate how to avoid doing there, if already done.
- -->
+ <!-- This task unzips the test framework that was built. It includes misc.
+ files, the Test Framework proper, and a zipped up repo of the unit tests.
+ We also do this in "testAll" scripts ...? TODO: investigate how to avoid
+ doing there, if already done. -->
<target name="unzipTestFramework">
<fail unless="testDir" />
<fail unless="buildId" />
@@ -964,7 +945,7 @@
<echo message="testDir: ${testDir}" />
<echo message="testResults: ${testResults}" />
- <!--set up testing directory -->
+ <!--set up testing directory -->
<unzip
src="${testFramework}"
dest="${testDir}"
@@ -981,7 +962,7 @@
depends="init"
unless="env.TESTING_TEST_XML">
- <!--run the tests -->
+ <!--run the tests -->
<exec
dir="${executionDir}"
executable="${testExecutable}">
@@ -999,10 +980,8 @@
</exec>
</target>
- <!--
- Prints properties in "PHP form" to use on test results summary,
- to be sure accurate and meaningful.
- -->
+ <!-- Prints properties in "PHP form" to use on test results summary, to
+ be sure accurate and meaningful. -->
<target
name="printMainPropertiesAsPHP"
depends="init"
@@ -1017,7 +996,7 @@
name="phpPropertyFile"
value="${junit-report-output}/testProperties.php" />
- <!-- on first write to php file, don't append -->
+ <!-- on first write to php file, don't append -->
<echo
message="&lt;?php${EOL}"
append="false"
@@ -1032,11 +1011,10 @@
<printPHPProperty
phpvar="INVOKED_JAVA_VERSION"
value="javaversionEscaped" />
- <!--
- Note: there might be times, the java.runtime.version at this point in time,
- may not be quite right ... such as if invoked with some other VM with the intent of
- using 'jvm' on "eclipse" command line ... which we currently do not do.
- -->
+ <!-- Note: there might be times, the java.runtime.version at this point
+ in time, may not be quite right ... such as if invoked with some other VM
+ with the intent of using 'jvm' on "eclipse" command line ... which we currently
+ do not do. -->
<printPHPProperty
phpvar="JAVA_VERSION"
value="java.version" />
@@ -1064,7 +1042,7 @@
<printPHPProperty
phpvar="OSGI_ARCH"
value="osgi.arch" />
- <!-- NODE_NAME will be empty string, if on master -->
+ <!-- NODE_NAME will be empty string, if on master -->
<condition
property="hudsonSlave"
value="master">
@@ -1080,7 +1058,7 @@
arg2=" " />
</or>
</condition>
- <!-- if not set above, we'll set to the non blank NODE_NAME -->
+ <!-- if not set above, we'll set to the non blank NODE_NAME -->
<property
name="hudsonSlave"
value="${env.NODE_NAME}" />
@@ -1088,12 +1066,9 @@
<printPHPProperty
phpvar="HUDSON_NODE_NAME"
value="hudsonSlave" />
- <!--
- I believe all (common) platforms have env variable for HOSTNAME.
- If not, user might want to set/export to be meaningful.
- (Surprisingly, it doesn't seem obvious that Hudson makes this available
- in its process environment).
- -->
+ <!-- I believe all (common) platforms have env variable for HOSTNAME. If
+ not, user might want to set/export to be meaningful. (Surprisingly, it doesn't
+ seem obvious that Hudson makes this available in its process environment). -->
<printPHPProperty
phpvar="HOSTNAME"
value="env.HOSTNAME" />
@@ -1106,11 +1081,8 @@
<printPHPProperty
phpvar="HUDSON_BUILD_URL"
value="env.BUILD_URL" />
- <!--
- With HUDSON_URL and WORKSPACE_PATH should be able
- to figure out URL to WORKSPACE, though only temporarily
- available (until next job is ran).
- -->
+ <!-- With HUDSON_URL and WORKSPACE_PATH should be able to figure out URL
+ to WORKSPACE, though only temporarily available (until next job is ran). -->
<printPHPProperty
phpvar="HUDSON_URL"
value="env.HUDSON_URL" />
@@ -1134,16 +1106,14 @@
phpvar="ECLIPSE_PERF_ASSERTAGAINST"
value="eclipse.perf.assertAgainst" />
- <!--
- We end with an empty line, but it is recommended to not
- end included PHP files with "end PHP" marker.
- -->
+ <!-- We end with an empty line, but it is recommended to not end included
+ PHP files with "end PHP" marker. -->
<echo
message="${EOL}"
append="true"
file="${phpPropertyFile}" />
- <!-- set property so we only print these variables once -->
+ <!-- set property so we only print these variables once -->
<property
name="printedMainPHPProperties"
value="true" />
@@ -1157,10 +1127,8 @@
name="VMSource"
value="VM used for tests, is same that invoked Ant: '${java.home}/bin/java' (that is, 'jvm' not specified by caller)." />
<echo message="VMSource: ${VMSource}" />
- <!--
- Remember, we don't want J2SE-X.0 set at all, if there is nothing
- that can run tests that require that level.
- -->
+ <!-- Remember, we don't want J2SE-X.0 set at all, if there is nothing that
+ can run tests that require that level. -->
<property
name="jvm"
value="${java.home}/bin/java" />
@@ -1176,7 +1144,8 @@
<echo message="full output from 'java -version' of ${jvm} is " />
<echo message="${javaversionEscaped}" />
- <!--enable tests requiring 1.5 or or greater vms to run if running vm level detected matches required execution environment -->
+ <!--enable tests requiring 1.5 or or greater vms to run if running vm level
+ detected matches required execution environment -->
<condition
property="J2SE-8.0"
value="${jvm}">
@@ -1222,10 +1191,8 @@
name="VMSource"
value="VM used for tests, specified by caller: 'jvm'=${jvm}" />
<echo message="VMSource: ${VMSource}" />
- <!--
- Remember, we don't want J2SE-X.0 set at all, if there is nothing
- that can run tests that require that level.
- -->
+ <!-- Remember, we don't want J2SE-X.0 set at all, if there is nothing that
+ can run tests that require that level. -->
<exec
executable="${jvm}"
outputproperty="javaversion">
@@ -1273,11 +1240,9 @@
<echo message="J2SE-6.0: ${J2SE-6.0}" />
<echo message="J2SE-5.0: ${J2SE-5.0}" />
</target>
- <!--
- function to centralize how we get (that is, set) the value of
- 'javaMajorVersion'. (expected to be integer, such as 5,6,7,8,9,
- or will be "0" if the version could not be determined, for some reason.
- -->
+ <!-- function to centralize how we get (that is, set) the value of 'javaMajorVersion'.
+ (expected to be integer, such as 5,6,7,8,9, or will be "0" if the version
+ could not be determined, for some reason. -->
<target
name="setJavaMajorVersion"
@@ -1287,11 +1252,9 @@
<echo message="javaversion in setJavaMajorVersion: ${javaversionEscaped}" />
<script language="javascript">
- <!--
- technically does not have to be wrapped in "CDATA" (Ant and BSD define
- it that way, but if not done, other tools (such as XML Editor) can
- break the code by changing the formatting.
- -->
+ <!-- technically does not have to be wrapped in "CDATA" (Ant and BSD define
+ it that way, but if not done, other tools (such as XML Editor) can break
+ the code by changing the formatting. -->
<![CDATA[
var javaVer = project.getProperty("javaversionEscaped");
var pattern = new RegExp(/^.*1\.([456789]\.\d)/);
@@ -1317,7 +1280,7 @@
<attribute name="phpvar" />
<attribute name="value" />
<sequential>
- <!-- DEBUG <echo message="@{value}" /> -->
+ <!-- DEBUG <echo message="@{value}" /> -->
<condition
property="printValue@{value}"
value="${@{value}}"
@@ -1331,7 +1294,7 @@
</sequential>
</macrodef>
<macrodef name="escapeProperty">
- <!-- the use of propertyfile and local require at least Ant 1.8 -->
+ <!-- the use of propertyfile and local require at least Ant 1.8 -->
<attribute name="property" />
<sequential>
<echo message="DEBUG @{property}: ${@{property}}" />
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index 14ab5421..85cb5fcd 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -47,7 +47,9 @@ export ANT_HOME=/shared/common/apache-ant-1.9.2
#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
export JAVA_HOME=/shared/common/jdk1.7.0-latest
-export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin
+# added /opt/local/bin for 'port' versoin of wget, on Mac
+export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin:/opt/local/bin
+
# Be sure to set to a "fresh" non-cluttered area, so can be easily cleaned up.
export WORKSPACE=${HOME}/tempworkarea
@@ -93,8 +95,9 @@ echo "PWD: $PWD"
# ? There are a number of test-<something> methods in test xml which, by convention, mean
# to simply test the test script itself. The test-all target runs all of those tests.
-
-ant -f "${WORKSPACE}/${ANTFILE}" -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance -DskipDerby=true
+# MUST change the arch values here, then testing on other platforms!
+#ant -f "${WORKSPACE}/${ANTFILE}" -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance -DskipDerby=true
+ant -f "${WORKSPACE}/${ANTFILE}" -DbuildId=$buildId -DeclipseStream=$eclipseStream -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=x86_64 -DEBUILDER_HASH=${EBUILDER_HASH} -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dtest.target=performance -DskipDerby=true
rc=$?
if [[ $rc == 0 ]]
then

Back to the top