Changeset 737 for branches


Ignore:
Timestamp:
Nov 8, 2007 6:14:16 AM (12 years ago)
Author:
stefan
Message:

always rerun configure

Location:
branches/testScripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts

    • Property svn:ignore set to
      NBuserParameters.py
  • branches/testScripts/NBbuildConfig.py

    r730 r737  
    239239
    240240  # If config was previously run, then no need to run again.
    241   if NBcheckResult.didConfigRunOK() :
    242     NBlogMessages.writeMessage("  configure previously ran. Not rerunning.")
    243   else :
    244     NBlogMessages.writeMessage("  "+configCmd)
    245 
    246     # Finally run config
    247     result=NBosCommand.run(configCmd)
    248     stdoutfile=open('NBconfig.stdout','w')
    249     stdoutfile.write(result['stdout'])
    250     stdoutfile.close()
    251     stderrfile=open('NBconfig.stderr','w')
    252     stderrfile.write(result['stderr'])
    253     stderrfile.close()
    254 
    255     # Check if configure worked
    256     if result['returnCode'] != 0 :
    257         error_msg = result
    258         error_msg['configure flags']=configOptions
    259         error_msg['svn version']=configuration['svnVersion']
    260         # Add contents of log file to message
    261         logFileName = 'config.log'
    262         if os.path.isfile(logFileName) :
    263           logFilePtr = open(logFileName,'r')
    264           error_msg['config.log'] = logFilePtr.read()
    265           logFilePtr.close()
    266         NBemail.sendCmdMsgs(configuration['project'],error_msg,configCmd)
    267         return
     241#  if NBcheckResult.didConfigRunOK() :
     242#    NBlogMessages.writeMessage("  configure previously ran. Not rerunning.")
     243#  else :
     244  NBlogMessages.writeMessage("  "+configCmd)
     245
     246  # Finally run config
     247  result=NBosCommand.run(configCmd)
     248  stdoutfile=open('NBconfig.stdout','w')
     249  stdoutfile.write(result['stdout'])
     250  stdoutfile.close()
     251  stderrfile=open('NBconfig.stderr','w')
     252  stderrfile.write(result['stderr'])
     253  stderrfile.close()
     254
     255  # Check if configure worked
     256  if result['returnCode'] != 0 :
     257      error_msg = result
     258      error_msg['configure flags']=configOptions
     259      error_msg['svn version']=configuration['svnVersion']
     260      # Add contents of log file to message
     261      logFileName = 'config.log'
     262      if os.path.isfile(logFileName) :
     263        logFilePtr = open(logFileName,'r')
     264        error_msg['config.log'] = logFilePtr.read()
     265        logFilePtr.close()
     266      NBemail.sendCmdMsgs(configuration['project'],error_msg,configCmd)
     267      return
    268268
    269269  #---------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.