Changeset 702 for branches

Timestamp:

Oct 26, 2007 8:05:03 AM (12 years ago)

Author:

stefan

Message:

extend email-message; and a bit more cleaning and bugfixing

Location:

branches/testScripts

Files:

• NBbuildConfig.py (modified) (5 diffs)
• NBemail.py (modified) (2 diffs)
• NBprojectConfig.py (modified) (2 diffs)
• NBuserParametersDefault.py (modified) (4 diffs)
• nightlyBuild.py (modified) (2 diffs)

branches/testScripts/NBbuildConfig.py

@@ -214 +214 @@
   os.chdir(fullVpathDir)
   NBlogMessages.writeMessage('  Current directory: '+fullVpathDir)
-  
+
   # Assemble all config options together and create config command
   configOptions ="-C "+configuration['configOptions']['unique']
-  configOptions+=configuration['configOptions']['unique']
   configOptions+=configuration['configOptions']['invariant']
   configOptions+=skipOptions
@@ -242 +241 @@
     if result['returnCode'] != 0 :
         error_msg = result
+        error_msg['configure flags']=configOptions
         # Add contents of log file to message
         logFileName = 'config.log'
         if os.path.isfile(logFileName) :
           logFilePtr = open(logFileName,'r')
-          error_msg['config.log']  = "config.log contains: \n" 
-          error_msg['config.log'] += logFilePtr.read()
+          error_msg['config.log'] = logFilePtr.read()
           logFilePtr.close()
         NBemail.sendCmdMsgs(configuration['project'],error_msg,configCmd)
@@ -266 +265 @@
   # Check if make worked
   if result['returnCode'] != 0 :
+    result['configure flags']=configOptions
     NBemail.sendCmdMsgs(configuration['project'],result,'make')
     return
@@ -284 +284 @@
   didMakeTestFail=configuration['checkMakeTest'](result,configuration['project'],"make test")
   if didMakeTestFail :
+    result['configure flags']=configOptions
     result['make test']=didMakeTestFail
     NBemail.sendCmdMsgs(configuration['project'],result,"make test")
@@ -317 +318 @@
     didUnitTestFail=configuration['unitTest']['checkUnitTest'](result,configuration['project'],unitTestCmdTemplate)
     if didUnitTestFail :
+      result['configure flags']=configOptions
       result['unitTest']=didUnitTestFail
       NBemail.sendCmdMsgs(p,result,unitTestCmd)

branches/testScripts/NBemail.py

@@ -22 +22 @@
 #       "make".
 #  cmdMsgs: the messages generated by cmd.  This will typically contain
-#       errors issued by cmd.
+#       errors issued by cmd and additional information about the build.
 #------------------------------------------------------------------------
 def sendCmdMsgs(project,cmdMsgs,cmd):
   curDir = os.getcwd()
-  
+
   toAddrs = [unscrambleAddress(NBuserConfig.MY_EMAIL_ADDR)]
   if NBprojectConfig.PROJECT_EMAIL_ADDRS.has_key(project) \
@@ -35 +35 @@
     toAddrs.append(unscrambledEmailAddress)
 
-  subject = "NightlyBuild: "+project + " problem when running '" + cmd +"'"
+  subject = "NightlyBuild: problem with project "+project+" when running '" + cmd +"'"
 
-  emailMsg  = "'" + cmd + "' from directory " + curDir + " failed.\n\n"
+  emailMsg = "Dear projectmanager,\n\n" \
+   +"the nightly build tests scripts have recognized a failure when building project "+project+". The failing command was\n\n\t"+cmd+"\n\n" \
+   +"Details on the problem can be found below.\n" \
+   +"You will also get a failure message if the build of your project failed because of problems with a depending projects (externals).\n" \
+   +"We hope you find this report useful.\n\n"
 
   emailMsg += "Operating System: "+sys.platform+" "+os.name+"\n"
   emailMsg += "Host name: "+gethostname()+"\n"
 
+  if os.environ.has_key("HOSTTYPE") :
+    emailMsg += "Host type: "+os.environ["HOSTTYPE"]+"\n"
   if os.environ.has_key("PROCESSOR_IDENTIFIER") :
     emailMsg += "Processor: "+os.environ["PROCESSOR_IDENTIFIER"]+"\n"
-                                         
   if os.environ.has_key("NUMBER_OF_PROCESSORS") :
     emailMsg += "Number of processors: "+os.environ["NUMBER_OF_PROCESSORS"]+"\n"
-    
+
   if os.environ.has_key("PATH") :
     emailMsg += "PATH: "+os.environ["PATH"]+"\n"
+
+  emailMsg += "Directory: "+curDir+'\n'
+
+  if cmdMsgs.has_key("configure flags") :
+    emailMsg += "Flags for configure: "+cmdMsgs['configure flags']+'\n'
 
   if cmdMsgs.has_key('make test') :

branches/testScripts/NBprojectConfig.py

@@ -6 +6 @@
 #----------------------------------------------------------------------
 # This file defines variables which describe how the specific
-# coin-or projects are to be build and tested. 
+# coin-or projects are to be tested and who are their managers.
 #----------------------------------------------------------------------
 
@@ -75 +75 @@
 PROJECT_EMAIL_ADDRS['OS'] = 'kipp _DOT_ martin _AT_ chicagogsb _DOT_ edu'
 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['OS'] = ['make test']
-#third party packages are not optional here (because it uses Ipopt)
+#third party packages are not optional if Ipopt is not excluded
 
 #----------------------------------------------------------------------
 PROJECT_EMAIL_ADDRS['CppAD'] = 'bradbell _AT_ washington _DOT_ edu'
 #does not have references to third party packages
-
-

branches/testScripts/NBuserParametersDefault.py

@@ -14 +14 @@
 # List of Projects to be processed by script
 #----------------------------------------------------------------------
-PROJECTS = ['CoinUtils','DyLP','Clp','SYMPHONY','Vol','Osi','Cgl','Cbc','Ipopt','Bonmin','FlopC++','OS']
-
-
+PROJECTS = ['CoinUtils','DyLP','Clp','SYMPHONY','Vol','Osi','Cgl','Cbc','Ipopt','Bonmin','FlopC++','OS','CppAD']
 
 #---------------------------------------------------
-#  Not sure what file this belongs in.
 #  This data structure is intended to describe how each COIN project
 #  should be built.
@@ -63 +60 @@
      [ 
        { 'Reference' : 'CoinUtils' }, 
-           
-            
        # And build a parallel version with Third Party
        { 
-         'SvnVersion': 'releases/1.2.0', 
+         'SvnVersion': 'latestStable', 
          'OptLevel': 'Default', 
          'ThirdParty': 'Yes', 
-         'AdditionConfigOptions': '--enable-cbc-parallel' 
+         'AdditionalConfigOptions': '--enable-cbc-parallel' 
        }
      ],
@@ -93 +88 @@
          'ThirdParty': 'No', 
          'SkipProjects': ('Ipopt') } 
+     ],
+   'CppAD' : 
+     [ 
+       { 'SvnVersion': 'latestStable',  'OptLevel': 'Default',   'ThirdParty': 'No' } 
      ]
   }
 
+#----------------------------------------------------------------------
+#On some systems the user might want to set extra options for the
+#configure script like compilers...
+#----------------------------------------------------------------------
 
-
+CONFIGURE_FLAGS = ''
 
 
@@ -147 +150 @@
 
 SEND_MAIL_TO_PROJECT_MANAGER = 0
-
-#----------------------------------------------------------------------
-#On some systems the user might want to set extra options for the
-#configure script like compilers...
-#----------------------------------------------------------------------
-
-CONFIGURE_FLAGS = ''

branches/testScripts/nightlyBuild.py

@@ -3 +3 @@
 import os
 import sys
-#import NBuserConfig
 import NBprojectConfig
 import NBlogMessages
@@ -20 +19 @@
 
 
-
 # TODO:
-#   -Get some information about the platform and put this in email 
-#    failure message. Add text better explaining the email so project
-#    managers can better understand it.  Somehow remember the ./configure
-#    command options and put it in the email message.
 #   -In userConfig allow one to optionally do a clean checkout and/or config
-#   -Skip make of project that depend on a project which make had been failing.
-#    (Similar for configure.) But also tell project managers of skiped 
-#    project that their project was skipped.
 #   -Clean up the kludge that tests if "make test" and 'unitTest' were
 #    successfull