Changeset 612

Timestamp:

Oct 15, 2007 8:28:53 AM (12 years ago)

Author:

jpfasano

Message:

Added special code to determine if Cbc's "make test" ran successfully.
Cbc's "make test" does not print the message "All Tests Completed Successfully", so some different checks are needed.

File:

• branches/testScripts/nightlyBuild.py (modified) (3 diffs)

branches/testScripts/nightlyBuild.py

@@ -142 +142 @@
 
   emailMsg  = "'" + cmd + "' from directory " + curDir + " failed.\n\n"
+  emailMsg += "Operating System: "+os.name
   emailMsg += "'" + cmd + "' messages are:\n" 
   emailMsg += cmdMsgs
@@ -164 +165 @@
   else :
     writeLogMessage( "Failure reading pwFileName=" + SMTP_PASSWORD_FILENAME )
-    print cmdMsgs
     sys.exit(1)
     
@@ -209 +209 @@
         retVal = 1
 
+  #---------------------------------------------------------------------
   # Some (project,buildStep) pairs require further checking
+  # to determine if they were successful
+  #---------------------------------------------------------------------
+  # Clp's "./clp -unitTest -netlib dirNetlib=_NETLIBDIR_"
   if project=='Clp' and buildStep==UNITTEST_CMD['Clp'] :
-    # Build Step is './clp -unitTest -netlib' 
     # 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][len(rc[1])-200:]
+    msgTail = rc[1][-200:]
+    if not re.compile(reexp).match(msgTail,1) :
+      # message not found, assume test failed
+      retVal = 1
+  elif project=='Cbc' and buildStep=='make test' :
+    # Check that last the last few lines are of the form
+    # '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:]
     if not re.compile(reexp).match(msgTail,1) :
       # message not found, assume test failed