Changeset 626

Timestamp:

Oct 17, 2007 7:52:37 AM (12 years ago)

Author:

jpfasano

Message:

Added NBosCommand (nightly build operating system command).
This is an attempt to run commands and exe's in a subprocess, so if they
crash they don't bring down the script

Location:

branches/testScripts

Files:

• NBemail.py (modified) (1 diff)
• NBosCommand.py (added)
• NBuserConfig.py (modified) (1 diff)
• nightlyBuild.py (modified) (14 diffs)

branches/testScripts/NBemail.py

@@ -42 +42 @@
   emailMsg += "Host name: "+gethostname()+"\n\n"
 
-  emailMsg += "'" + cmd + "' messages are:\n" 
-  emailMsg += cmdMsgs
+  emailMsg += "stderr messages are:\n" 
+  emailMsg += cmdMsgs['stderr']
+  emailMsg += "\n\nstdout messages are:\n"
+  emailMsg += cmdMsgs['stdout']
+  if cmdMsgs.has_key('config.log') :
+    emailMsg += "\n\nconfig.log messages are:\n"
+    emailMsg += cmdMsgs['config.log']
   send(toAddrs,subject,emailMsg)
   NBlogMessages.writeMessage( "  email sent regarding "+project+" running '"+cmd+"'" )

branches/testScripts/NBuserConfig.py

@@ -79 +79 @@
 # List of Projects to be processed by script
 #----------------------------------------------------------------------
-PROJECTS = ['CoinUtils','DyLP','Clp','SYMPHONY','Vol','Osi','Cgl','Cbc','Ipopt','OS','CppAD']
-PROJECTS = ['CoinUtils']
+PROJECTS = ['CoinUtils','DyLP','Clp','SYMPHONY','Vol','Osi','Cgl','Cbc',\
+            'FlopC++','Ipopt','OS','CppAD']
 
 

branches/testScripts/nightlyBuild.py

@@ -3 +3 @@
 import os
 import sys
-import commands
 import smtplib
 import re 
@@ -11 +10 @@
 import NBlogMessages
 import NBemail
+import NBosCommand
 
 # TODO:
@@ -26 +26 @@
 
 
-#------------------------------------------------------------------------
-# Run command in another process.
-# Return: command's return code, stdout messages, & stderr messages
-#------------------------------------------------------------------------
-def runCommand(cmd) :
-  p=subprocess.Popen(cmd,shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-  p.wait
-  cmdRc=p.returncode
-  cmdStdout=p.stdout.read()
-  cmdStderr=p.stderr.read() 
 
 #------------------------------------------------------------------------
 # Function to Check Return Code from unitTest
 #------------------------------------------------------------------------
-def didTestFail( rc, project, buildStep ) :
+def didTestFail( result, project, buildStep ) :
   retVal = 0
 
   # If the return code is not 0, then failure
-  if rc[0] != 0 :
+  if result['returnCode'] != 0 :
     retVal = 1
 
@@ -52 +42 @@
     if buildStep in NBprojectConfig.ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS[project] :
       # Is the success message contained in the output?
-      if rc[1].rfind("All tests completed successfully") == -1 :
+      if result['stderr'].rfind("All tests completed successfully") == -1 and \
+         result['stdout'].rfind("All tests completed successfully") == -1 :
         # Success message not found, assume test failed
         retVal = 1
@@ -64 +55 @@
     # Check that last netlib test case ran by looking for message of form
     # '../../Data/Netlib/woodw took 0.47 seconds using algorithm either'
-    reexp = r"(.|\n)*\.\.(\\|/)\.\.(\\|/)Data(\\|/)Netlib(\\|/)woodw took (\d*\.\d*) seconds using algorithm either(.|\n)*"
-    msgTail = rc[1][-200:]
+    reexp = r"(.|\n)*(\\|/)Data(\\|/)Netlib(\\|/)woodw took (\d*\.\d*) seconds using algorithm either(.|\n)*"
+    msgTail = result['stdout'][-200:]
     if not re.compile(reexp).match(msgTail,1) :
       # message not found, assume test failed
@@ -75 +66 @@
     # 'cbc_clp solved 2 out of 2 and took XX.XX seconds.'
     reexp=r"(.|\n)*cbc_clp solved 2 out of 2 and took (\d*\.\d*) seconds."
-    msgTail = rc[1][-300:]
+    msgTail = result['stdout'][-300:]
     if not re.compile(reexp).match(msgTail,1) :
       # message not found, assume test failed
@@ -82 +73 @@
   # Cbc's "./cbc -unitTest dirNetlib=_MIPLIB3DIR_ -miplib"
   elif project=='Cbc' and buildStep==NBprojectConfig.UNITTEST_CMD['Cbc'] :
-    if rc[0]>=0 and rc[0]<=2 :
+    if result['returnCode']>=0 and result['returnCode']<=2 :
       # return code is between 0 and 2.
       # Return code between 1 and 44 is the number of test cases that
@@ -100 +91 @@
   os.chdir(dir)
   NBlogMessages.writeMessage('  '+svnCmd)
-  rc=commands.getstatusoutput(svnCmd)
-  if rc[0] != 0 :
-    NBemail.sendCmdMsgs(project,rc[1],svnCmd)
+  result = NBosCommand.run(svnCmd)
+  if result['returnCode'] != 0 :
+    NBemail.sendCmdMsgs(project,result,svnCmd)
     retVal='Error'
   return retVal
@@ -113 +104 @@
 #  If needed create the top level directory
 #------------------------------------------------------------------------
-# rc=commands.getstatusoutput(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR)
 if not os.path.isdir(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR) :
   os.makedirs(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR)
@@ -131 +121 @@
     if issueSvnCmd(svnCmd,dataBaseDir,'Data')!='OK' :
       sys.exit(1)
-    rc=commands.getstatusoutput('find '+d+' -name \*.gz -print | xargs gzip -d')
+    result=NBosCommand.run('find '+d+' -name \*.gz -print | xargs gzip -d')
 netlibDir=os.path.join(dataBaseDir,'Netlib')
 miplib3Dir=os.path.join(dataBaseDir,'miplib3')
@@ -140 +130 @@
 for p in NBuserConfig.PROJECTS:
   NBlogMessages.writeMessage( p )
-  rc = [0]
 
   #---------------------------------------------------------------------
@@ -170 +159 @@
   configCmd = os.path.join('.','configure -C')
   NBlogMessages.writeMessage('  '+configCmd)
-  rc=commands.getstatusoutput(configCmd)
+  result=NBosCommand.run(configCmd)
   
   # Check if configure worked
-  if rc[0] != 0 :
-    error_msg = rc[1] + '\n\n'
+  if result['returnCode'] != 0 :
+    error_msg = result
     # Add contents of log file to message
     logFileName = 'config.log'
     if os.path.isfile(logFileName) :
       logFilePtr = open(logFileName,'r')
-      error_msg += "config.log contains: \n" 
-      error_msg += logFilePtr.read()
+      error_msg['config.log']  = "config.log contains: \n" 
+      error_msg['config.log'] += logFilePtr.read()
       logFilePtr.close()
     NBemail.sendCmdMsgs(p,error_msg,configCmd)
@@ -186 +175 @@
 
   #---------------------------------------------------------------------
-  # Run make part of buid
+  # Run make part of build
   #---------------------------------------------------------------------
   NBlogMessages.writeMessage( '  make' )
-  rc=commands.getstatusoutput('make')
+  result=NBosCommand.run('make')
   
   # Check if make worked
-  if rc[0] != 0 :
-    NBemail.sendCmdMsgs(p,rc[1],'make')
+  if result['returnCode'] != 0 :
+    NBemail.sendCmdMsgs(p,result,'make')
     continue
 
   #---------------------------------------------------------------------
-  # Run 'make test' part of buid
+  # Run 'make test' part of build
   #---------------------------------------------------------------------
   NBlogMessages.writeMessage( '  make test' )
-  rc=commands.getstatusoutput('make test')
+  result=NBosCommand.run('make test')
   
   # Check if 'make test' worked
-  if didTestFail(rc,p,"make test") :
-    NBemail.sendCmdMsgs(p,rc[1],"make test")
+  if didTestFail(result,p,"make test") :
+    NBemail.sendCmdMsgs(p,result,"make test")
     continue
 
@@ -219 +208 @@
 
     NBlogMessages.writeMessage( '  '+unitTestCmd )
-    rc=commands.getstatusoutput(unitTestCmd)
+    result=NBosCommand.run(unitTestCmd)
   
-    if didTestFail(rc,p,unitTestCmdTemplate) :
-      NBemail.sendCmdMsgs(p,rc[1],unitTestCmd)
+    if didTestFail(result,p,unitTestCmdTemplate) :
+      NBemail.sendCmdMsgs(p,result,unitTestCmd)
       continue