geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1036459 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS: Controller.groovy report/ReportGenerator.groovy
Date Thu, 18 Nov 2010 13:55:21 GMT
Author: genspring
Date: Thu Nov 18 13:55:21 2010
New Revision: 1036459

URL: http://svn.apache.org/viewvc?rev=1036459&view=rev
Log:
setup standalone tck iteration automation

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

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=1036459&r1=1036458&r2=1036459&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
Thu Nov 18 13:55:21 2010
@@ -136,20 +136,20 @@ class Controller extends gbuild.system.P
     }
     
     def showProcessesAndTemp() {
-        def shell = new ShellExecutor()
+       /* def shell = new ShellExecutor()
         shell << """
-            ps -ef | grep anthill | grep -v com.urbancode.anthill3.main | grep -v grep |
grep -v \$0
+            ps -ef | grep anthill | grep -v com.urbancode.anthill3.main | grep -v grep |
grep -v /$0
             
             echo ""
             echo "Tmp files:"
-            ls -lh /tmp | grep -v `basename \$0`
+            ls -lh /tmp | grep -v `basename /$0`
             """
-        shell.execute()
+        shell.execute()*/
     }
         
     def runtests = {
-        showEnv()
-        showProcessesAndTemp()
+       // showEnv()
+       // showProcessesAndTemp()
         
         def exec = new ExecCommand(context)
         exec.executable = 'project/tck-testsuite/runtests'
@@ -267,7 +267,7 @@ class Controller extends gbuild.system.P
             }
             
             // Clean up after retard-o-tron TCK
-            ant.delete() {
+           /* ant.delete() {
                 fileset(dir: '/tmp') {
                     include(name: 'anthill-cts-props.txt')
                     include(name: 'geronimo*.tmp')
@@ -279,21 +279,21 @@ class Controller extends gbuild.system.P
                     include(name: 'deniedFile*tmp')
                     include(name: 'fSimpleTabularData*ser')
                 }
-            }
+            }*/
             
             //
             // HACK: Show what processes and tmp are left around afterwards
             //
-            showProcessesAndTemp()
+           // showProcessesAndTemp()
             
             // This isn't working properly.  Comment it out for now.
             // Nuke any bastard children
             //new BastardChildReaper().reap()
             // Still need to make sure that the server isn't left around after the test finishes
-            ShellExecutor.execute('pkill -9 -f server.jar')
-            ShellExecutor.execute('pkill -9 -f geronimo-main.jar')
-            ShellExecutor.execute('pkill -9 -f dbprocedures.jar')
-            ShellExecutor.execute('pkill -9 -f admin-cli.jar')             
+           // ShellExecutor.execute('pkill -9 -f server.jar')
+           // ShellExecutor.execute('pkill -9 -f geronimo-main.jar')
+           // ShellExecutor.execute('pkill -9 -f dbprocedures.jar')
+           // ShellExecutor.execute('pkill -9 -f admin-cli.jar')             
             
         }
     }
@@ -360,13 +360,29 @@ class Controller extends gbuild.system.P
 
 
   def javaeeLevel = params.require('javaee.level')
+  
+  def iterationName =params.get('iteration.name')
+
         
         if (javaeeLevel.equals('web')) {
-            cfg.configFile = 'project/tck-testsuite/iterations-web.xml'
+        
+        if(iterationName==null||iterationName.equals('all')) {
+            cfg.configFile = "project/tck-testsuite/iterations-web.xml"
+            }
+            else
+            {
+             cfg.configFile = "project/tck-testsuite/iterations-web-${iterationName}.xml"
+            }
         }
         
         if (javaeeLevel.equals('full')) {
-            cfg.configFile = 'project/tck-testsuite/iterations.xml'
+            if(iterationName==null||iterationName.equals('all')) {
+            cfg.configFile = "project/tck-testsuite/iterations-full.xml"
+            }
+            else
+            {
+             cfg.configFile = "project/tck-testsuite/iterations-full-${iterationName}.xml"
+            }
         }
 
         cfg.iteration = params.iteration
@@ -388,7 +404,7 @@ class Controller extends gbuild.system.P
         def targetDir = new File("target/results/$webcontainer").canonicalFile
         log.info "Target dir: $targetDir"
         
-        separator()
+        separator() 
         
         ant.mkdir(dir: targetDir)
         
@@ -453,7 +469,7 @@ class Controller extends gbuild.system.P
         
         separator()
         
-        new ReportGenerator(archives, targetDir, javaeeLevel).generate()
+        new ReportGenerator(null, targetDir, javaeeLevel).generate()
         
         separator()
     }

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?rev=1036459&r1=1036458&r2=1036459&view=diff
==============================================================================
--- 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
Thu Nov 18 13:55:21 2010
@@ -164,16 +164,32 @@ class ReportGenerator extends LogSupport
         }
         
         // Load the iterations.xml configuration so we can use that for rendering
-        def iterConfigurator = new IterationConfigurator()
+          def cfg = new IterationConfigurator()
+          def javaeeLevel = params.require('javaee.level')
+          def iterationName =params.get('iteration.name');
+
+        
         if (javaeeLevel.equals('web')) {
-            iterConfigurator.configFile = 'tck-testsuite/iterations-web.xml'
+            if(iterationName==null||iterationName.equals('all')) {
+            cfg.configFile = "project/tck-testsuite/iterations-web.xml"
+            }
+            else
+            {
+             cfg.configFile = "project/tck-testsuite/iterations-web-${iterationName}.xml"
+            }
         }
         
         if (javaeeLevel.equals('full')) {
-            iterConfigurator.configFile = 'tck-testsuite/iterations.xml'
+            if(iterationName==null||iterationName.equals('all')) {
+            cfg.configFile = "project/tck-testsuite/iterations-full.xml"
+            }
+            else
+            {
+             cfg.configFile = "project/tck-testsuite/iterations-full-${iterationName}.xml"
+            }
         }
         
-        def iterConfig = iterConfigurator.loadConfig()
+        def iterConfig = cfg.loadConfig()
         
         archives.each { archive ->
             log.info "Processing results archive: $archive"



Mime
View raw message