You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/11/28 04:31:14 UTC
svn commit: r1039826 -
/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Author: genspring
Date: Sun Nov 28 03:31:13 2010
New Revision: 1039826
URL: http://svn.apache.org/viewvc?rev=1039826&view=rev
Log:
adding cleanEnvironment task in the controller
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=1039826&r1=1039825&r2=1039826&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 Sun Nov 28 03:31:13 2010
@@ -266,34 +266,17 @@ class Controller extends gbuild.system.P
}
}
- // Clean up after retard-o-tron TCK
- ant.delete() {
- fileset(dir: '/tmp') {
- include(name: 'anthill-cts-props.txt')
- include(name: 'geronimo*.tmp')
- include(name: 'test-*.jar')
- include(name: 'Axis*.att')
- include(name: 'accessedFile*tmp')
- include(name: 'deniedFile*tmp')
- include(name: 'runtimedepplan*')
- include(name: 'deniedFile*tmp')
- include(name: 'fSimpleTabularData*ser')
- }
- }
+
//
// HACK: Show what processes and tmp are left around afterwards
//
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')
+ cleanEnvironment()
+
+ showProcessesAndTemp()
+
}
}
@@ -475,7 +458,33 @@ class Controller extends gbuild.system.P
separator()
}
- def cleanupProcesses = {
- new BastardChildReaper().reap()
+ def cleanEnvironment = {
+
+ // 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
+
+ ant.delete() {
+ fileset(dir: '/tmp') {
+ include(name: 'anthill-cts-props.txt')
+ include(name: 'geronimo*.*')
+ include(name: 'test-*.jar')
+ include(name: 'Axis*.att')
+ include(name: 'axis2*.tmp')
+ include(name: '*wscompile*')
+ include(name: 'accessedFile*tmp')
+ include(name: 'deniedFile*tmp')
+ include(name: 'runtimedepplan*')
+ include(name: 'deniedFile*tmp')
+ include(name: 'fSimpleTabularData*ser')
+ }
+ }
+
+ 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')
}
}