ajack 2004/04/05 11:15:48
Modified: python/gump/document forrest.py text.py
python/gump/utils launcher.py
Log:
Some doc fixes, and log the extended (timeout) command.
Revision Changes Path
1.131 +45 -1 gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/forrest.py,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- forrest.py 5 Apr 2004 16:31:45 -0000 1.130
+++ forrest.py 5 Apr 2004 18:15:48 -0000 1.131
@@ -81,6 +81,7 @@
# Document...
self.documentEnvironment(run,workspace)
self.documentWorkspace(run,workspace,gumpSet)
+ self.documentRunOptions(run,workspace)
# Document these (even if not a full build)
self.documentStatistics(run,workspace,gumpSet)
@@ -218,7 +219,7 @@
# env.xml
#
- document=XDocDocument('Workspace', \
+ document=XDocDocument('Gump Environment', \
self.resolver.getFile(workspace, 'environment.xml'))
envSection=document.createSection('Gump Environment')
@@ -228,6 +229,49 @@
self.documentAnnotations(document,environment)
#self.documentFileList(document,environment,'Environment-level Files')
self.documentWorkList(document,environment,'Environment-level Work')
+
+ document.serialize()
+
+ #####################################################################
+ #
+ # Options
+ #
+ def documentRunOptions(self,run,workspace):
+
+ options=run.getOptions()
+
+ #
+ # ----------------------------------------------------------------------
+ #
+ # env.xml
+ #
+
+ document=XDocDocument('Run Options', \
+ self.resolver.getFile(workspace, 'options.xml'))
+
+ optSection=document.createSection('Gump Run Options')
+ optSection.createParagraph(
+ """The options selected for this Gump run.""")
+
+ #self.documentAnnotations(document,options)
+
+ optTable=optSection.createTable(['Name','Value'])
+ opts=0
+ # iterate over this suites properties
+ for name in options.__dict__:
+ if name.startswith('__') and name.endswith('__'): continue
+ method=getattr(options,name)
+ # avoid nulls, metadata, and methods other than test*
+ if not method: continue
+ if isinstance(method,types.TypeType): continue
+ if not isinstance(method,types.MethodType): continue
+ if not callable(meth): continue
+ if not name.startswith('get') or not name.startswith('is') : continue
+
+ optTable.createEntry(str(name),str(method()))
+ opts+=1
+
+ if not opts: optTable.createEntry('None')
document.serialize()
1.17 +1 -1 gump/python/gump/document/text.py
Index: text.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/text.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- text.py 5 Apr 2004 16:31:45 -0000 1.16
+++ text.py 5 Apr 2004 18:15:48 -0000 1.17
@@ -52,7 +52,7 @@
workspace = run.getWorkspace()
gumpSet = run.getGumpSet()
- gumpEnv = run.getGumpEnvironment()
+ gumpEnv = run.getEnvironment()
#
#
1.19 +2 -1 gump/python/gump/utils/launcher.py
Index: launcher.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/launcher.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- launcher.py 5 Apr 2004 16:03:49 -0000 1.18
+++ launcher.py 5 Apr 2004 18:15:48 -0000 1.19
@@ -400,7 +400,6 @@
if f: f.close()
#############################################################
- log.debug('Executing: ' + execString + ' (Output to ' + str(outputFile) +
')')
# Set the signal handler and an N-second alarm
timer=None
@@ -415,6 +414,8 @@
timer.setDaemon(1)
timer.start()
+ log.debug('Executing: ' + execString + ' (Output to ' + str(outputFile) +
')')
+
#
# Execute Command & Wait
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
