Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 4492 invoked from network); 3 Feb 2007 03:34:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Feb 2007 03:34:39 -0000 Received: (qmail 59091 invoked by uid 500); 3 Feb 2007 03:34:45 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 59061 invoked by uid 500); 3 Feb 2007 03:34:45 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 34230 invoked by uid 99); 3 Feb 2007 03:08:05 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 19:08:05 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 19:07:58 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id E4E3C1A981A; Fri, 2 Feb 2007 19:07:37 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r502851 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS: Controller.groovy report/ReportGenerator.groovy report/TestCase.groovy Date: Sat, 03 Feb 2007 03:07:37 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070203030737.E4E3C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Fri Feb 2 19:07:37 2007 New Revision: 502851 URL: http://svn.apache.org/viewvc?view=rev&rev=502851 Log: Fixed a few problems Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestCase.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?view=diff&rev=502851&r1=502850&r2=502851 ============================================================================== --- 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 Fri Feb 2 19:07:37 2007 @@ -71,6 +71,11 @@ runtests() } + // + // TODO: May want to collect the harness too, so that report generation can work + // until AH supports picking up a specific dependency from a workflow + // + def collectRuntime = { def sourceDir = new File('.').canonicalFile log.info "Source dir: $sourceDir" @@ -240,6 +245,13 @@ def collectResults = { def workflowId = params.require('anthill.workflow.id') def iteration = params.require('iteration') + + // + // FIXME: Need this so we can include tck-work/ below + // should avoid putting results into that directory and rm this + // + + def webcontainer = params.require('webcontainer') def sourceDir = new File('project/tck-testsuite/target').canonicalFile log.info "Source dir: $sourceDir" Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy?view=diff&rev=502851&r1=502850&r2=502851 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy Fri Feb 2 19:07:37 2007 @@ -99,8 +99,7 @@ def testCases = [] scanner.each { file -> - def factory = { new TestResult(it) }.curry(file) - testCases << new TestCase(new LazyProxy(factory)) + testCases << TestCase.fromFile(file) } log.info 'Loading testsuite' Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestCase.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestCase.groovy?view=diff&rev=502851&r1=502850&r2=502851 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestCase.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestCase.groovy Fri Feb 2 19:07:37 2007 @@ -26,6 +26,7 @@ import java.text.SimpleDateFormat import gbuild.system.LogSupport +import gbuild.system.util.LazyProxy import org.apache.commons.lang.time.DurationFormatUtils @@ -75,6 +76,14 @@ def getStatus() { return result.status + } + + static TestCase fromFile(file) { + assert file + + file = new File("$file") + def factory = { new TestResult(it) }.curry(file) + return new TestCase(new LazyProxy(factory)) } }