Changeset 741 for branches


Ignore:
Timestamp:
Nov 9, 2007 11:15:54 PM (12 years ago)
Author:
jpfasano
Message:

more clean up. email should now include nightlyBuild log messages

Location:
branches/testScripts
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r740 r741  
    108108#------------------------------------------------------------------------
    109109def run(configuration) :
     110  NBlogMessages.clearMessages()
    110111  NBlogMessages.writeMessage( configuration['project'] )
    111112
     
    365366        if testResultFail :
    366367          result['svn version']=configuration['svnVersion']
    367           result['unitTest']=testResultFail
     368          result['test']=testResultFail
    368369          NBemail.sendCmdMsgs(configuration['project'],result,testCmd)
    369370          return
  • branches/testScripts/NBemail.py

    r722 r741  
    7676  emailMsg += "Directory: "+curDir+'\n'
    7777
    78   if cmdMsgs.has_key('make test') :
    79     emailMsg += "\n\n'make test' problem:\n"
    80     emailMsg += cmdMsgs['make test']
    81     emailMsg += "\n"
    82   if cmdMsgs.has_key('unitTest') :
    83     emailMsg += "\n\nDetected problem:\n"
    84     emailMsg += cmdMsgs['unitTest']
    85     emailMsg += "\n"
     78  if cmdMsgs.has_key('test') :
     79    emailMsg += "\n\nDetected problem when running test:\n"
     80    emailMsg += cmdMsgs['test']
     81    emailMsg += "\n"
     82
     83  emailMsg +="\nnightlyBuildScript log:\n"
     84  emailMsg +=NBlogMessages.getMessages()
    8685
    8786  emailMsg +="\n"
  • branches/testScripts/NBlogMessages.py

    r718 r741  
    1313#TODO: one could open the logfile once in the beginning, set it to sys.stdout, flush after each message, and close it finally
    1414
     15LOG_MESSAGES=''
     16
     17def clearMessages():
     18  global LOG_MESSAGES
     19  LOG_MESSAGES=''
     20
     21def getMessages():
     22  global LOG_MESSAGES
     23  return LOG_MESSAGES
     24
     25
    1526#------------------------------------------------------------------------
    1627# Function to write log messages
    1728#------------------------------------------------------------------------
    1829def writeMessage( msg ) :
     30  global LOG_MESSAGES
    1931  logMsg = time.ctime(time.time())+': '
    2032  logMsg += msg
     33  LOG_MESSAGES+=logMsg+'\n'
    2134  if LOGPRINT :
    2235    print logMsg
  • branches/testScripts/nightlyBuild.py

    r740 r741  
    181181        configuration.pop('test') 
    182182
    183       #---------------------------------------------------------------------
    184       # Setup checkMakeTest
    185       #---------------------------------------------------------------------
    186       #configuration['checkMakeTest']=NBprojectConfig.CHECK_MAKE_TEST[p]
    187 
    188 
    189       #---------------------------------------------------------------------
    190       # Set up unitTest
    191       #---------------------------------------------------------------------
    192       #configuration['unitTest']={}
    193       #if NBprojectConfig.UNITTEST_CMD.has_key(p) :
    194 #
    195       #  unitTestCmdTemplate=NBprojectConfig.UNITTEST_CMD[p]
    196       #  unitTestCmd=unitTestCmdTemplate.replace('_NETLIBDIR_',netlibDir)
    197       #  unitTestCmd=unitTestCmd.replace('_MIPLIB3DIR_',miplib3Dir)
    198       #  unitTestCmd=unitTestCmd.replace('_SAMPLEDIR_',sampleDir)
    199 #
    200       #  configuration['unitTest']['command']=unitTestCmd
    201       #  configuration['unitTest']['checkUnitTest']=NBprojectConfig.CHECK_UNITTEST[p]
    202       #  configuration['unitTest']['path']=NBprojectConfig.UNITTEST_DIR[p]
    203 #
    204       #else :
    205       #  # No unitTest so remove from configuration
    206       #  configuration.pop('unitTest')
    207183
    208184    if configuration['buildMethod']=='msSln' :
Note: See TracChangeset for help on using the changeset viewer.