Changeset 741 for branches

Timestamp:

Nov 9, 2007 11:15:54 PM (13 years ago)

Author:

jpfasano

Message:

more clean up. email should now include nightlyBuild log messages

Location:

branches/testScripts

Files:

• NBbuildConfig.py (modified) (2 diffs)
• NBemail.py (modified) (1 diff)
• NBlogMessages.py (modified) (1 diff)
• nightlyBuild.py (modified) (1 diff)

branches/testScripts/NBbuildConfig.py

@@ -108 +108 @@
 #------------------------------------------------------------------------
 def run(configuration) :
+  NBlogMessages.clearMessages()
   NBlogMessages.writeMessage( configuration['project'] )
 
@@ -365 +366 @@
         if testResultFail :
           result['svn version']=configuration['svnVersion']
-          result['unitTest']=testResultFail
+          result['test']=testResultFail
           NBemail.sendCmdMsgs(configuration['project'],result,testCmd)
           return

branches/testScripts/NBemail.py

@@ -76 +76 @@
   emailMsg += "Directory: "+curDir+'\n'
 
-  if cmdMsgs.has_key('make test') :
-    emailMsg += "\n\n'make test' problem:\n"
-    emailMsg += cmdMsgs['make test']
-    emailMsg += "\n" 
-  if cmdMsgs.has_key('unitTest') :
-    emailMsg += "\n\nDetected problem:\n"
-    emailMsg += cmdMsgs['unitTest']
-    emailMsg += "\n" 
+  if cmdMsgs.has_key('test') :
+    emailMsg += "\n\nDetected problem when running test:\n"
+    emailMsg += cmdMsgs['test']
+    emailMsg += "\n"
+
+  emailMsg +="\nnightlyBuildScript log:\n"
+  emailMsg +=NBlogMessages.getMessages()
 
   emailMsg +="\n"

branches/testScripts/NBlogMessages.py

@@ -13 +13 @@
 #TODO: one could open the logfile once in the beginning, set it to sys.stdout, flush after each message, and close it finally
 
+LOG_MESSAGES=''
+
+def clearMessages():
+  global LOG_MESSAGES
+  LOG_MESSAGES=''
+
+def getMessages():
+  global LOG_MESSAGES
+  return LOG_MESSAGES
+
+
 #------------------------------------------------------------------------
 # Function to write log messages
 #------------------------------------------------------------------------
 def writeMessage( msg ) :
+  global LOG_MESSAGES
   logMsg = time.ctime(time.time())+': '
   logMsg += msg
+  LOG_MESSAGES+=logMsg+'\n'
   if LOGPRINT :
     print logMsg

branches/testScripts/nightlyBuild.py

@@ -181 +181 @@
         configuration.pop('test')  
 
-      #---------------------------------------------------------------------
-      # Setup checkMakeTest
-      #---------------------------------------------------------------------
-      #configuration['checkMakeTest']=NBprojectConfig.CHECK_MAKE_TEST[p]
-
-
-      #---------------------------------------------------------------------
-      # Set up unitTest
-      #---------------------------------------------------------------------
-      #configuration['unitTest']={}
-      #if NBprojectConfig.UNITTEST_CMD.has_key(p) :
-#
-      #  unitTestCmdTemplate=NBprojectConfig.UNITTEST_CMD[p]
-      #  unitTestCmd=unitTestCmdTemplate.replace('_NETLIBDIR_',netlibDir)
-      #  unitTestCmd=unitTestCmd.replace('_MIPLIB3DIR_',miplib3Dir)
-      #  unitTestCmd=unitTestCmd.replace('_SAMPLEDIR_',sampleDir)
-#
-      #  configuration['unitTest']['command']=unitTestCmd
-      #  configuration['unitTest']['checkUnitTest']=NBprojectConfig.CHECK_UNITTEST[p]
-      #  configuration['unitTest']['path']=NBprojectConfig.UNITTEST_DIR[p]
-#
-      #else :
-      #  # No unitTest so remove from configuration
-      #  configuration.pop('unitTest')
 
     if configuration['buildMethod']=='msSln' :