You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ja...@apache.org on 2010/04/26 20:40:55 UTC
svn commit: r938181 -
/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Author: jawarner
Date: Mon Apr 26 18:40:55 2010
New Revision: 938181
URL: http://svn.apache.org/viewvc?rev=938181&view=rev
Log:
Starting to update the runtests method to run the current TCK
Modified:
geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy?rev=938181&r1=938180&r2=938181&view=diff
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy Mon Apr 26 18:40:55 2010
@@ -146,7 +146,7 @@ class Controller extends gbuild.system.P
"""
shell.execute()
}
-
+
def runtests = {
showEnv()
showProcessesAndTemp()
@@ -164,69 +164,9 @@ class Controller extends gbuild.system.P
tmpDir.mkdirs()
args << "-Djava.io.tmpdir=$tmpDir"
- // Fetch the required libraries and make copies (prevent unwanted side-effects)
- def repo = new gbuild.config.libraries.CodestationRepository()
-
- def getLibrary = { name, version, dir ->
- def lib = LibraryManager.getLibrary(repo, name, version)
- lib.mirror(dir)
- return lib
- }
-
- def workspaceDir = new File("${System.properties['user.home']}/gbuild/workspace/$baseVersion").canonicalFile
- def tckDir = new File(workspaceDir, 'tck')
- def riDir = new File(workspaceDir, 'ri')
-
- switch (baseVersion) {
- case '1.2':
- //
- // HACK: When retrying, libs are already there... will puke if we ask for them again
- //
- if (!params.retry) {
- getLibrary('JavaEE TCK/build - 1.4/Image', '1.4*', tckDir)
- getLibrary('JavaEE RI/build - 1.4/Image', '1.4*', riDir)
- }
-
- args << "-Dj2eetck.home=$tckDir"
- args << "-Dj2eeri.home=$riDir"
- break
-
- case '2.0':
- //
- // HACK: When retrying, libs are already there... will puke if we ask for them again
- //
- if (!params.retry) {
- getLibrary('JavaEE TCK/build - 5/Image', '5*', tckDir)
- getLibrary('JavaEE RI/build - 5/Image', '5*', riDir)
- }
-
- args << "-Djavaee5.cts.home=$tckDir"
- args << "-Djavaee5.ri.home=$riDir"
- break
- }
-
- // Run tests under the correct JVM per Geronimo version (1.2 needs 1.4, 2.0 needs 1.5)
- args << '--java-version'
- switch (baseVersion) {
- case '1.2':
- args << 1.4
- break
-
- case '2.0':
- args << 1.5
- break
- }
-
args << '--web'
args << params.require('webcontainer')
-
- //
- // TODO: See bits about using settings.xml for this, as this propery is deprecated
- //
-
- def repoDir = new File('repository').canonicalFile // Must be canonical
- args << "-Dmaven.repo.local=$repoDir"
-
+
//
// HACK: Handle retry
//
@@ -355,12 +295,24 @@ class Controller extends gbuild.system.P
// HACK: The current iteration of the automation doesn't use the harness
// to actually run the tests, so no runtests.properties file is create.
- // Create a basic file using information passed from AHP so reporting works
+ // Create a basic file using information passed from AHP and elsewhere
+ // so reporting works
+
+
+ // HACK: We'd like to have the geronimo server and cts revisions displayed
+ // on the reports page. They have been stored in some txt files in
+ // the repository. We need to retrieve them and store them as properties
+ // in the runtests.properties file.
+
+ def serverRevisionFile = new File('repository/serverRevision.txt').canonicalFile
+ def serverLines = serverRevisionFile.readLines()
+
+ def ctsRevisionFile = new File('repository/ctsRevision.txt').canonicalFile
+
def webcontainer = params.require('webcontainer')
def iteration = params.require('iteration')
-
def cfg = new IterationConfigurator()
cfg.configFile = 'tck-testsuite/iterations.xml'
cfg.iteration = iteration