Changeset 639

Timestamp:

Oct 19, 2007 7:35:56 PM (14 years ago)

Author:

jpfasano

Message:

Updated checkResult to look for message suggested by Lou for Osi tests

Location:

branches/testScripts

Files:

• NBcheckResult.py (modified) (1 diff)
• NBprojectConfig.py (modified) (1 diff)
• NBuserConfig.py (modified) (1 diff)

branches/testScripts/NBcheckResult.py

@@ -81 +81 @@
       # message found, assume test failed
       retVal = 1
-    # Stdout should contain "Coin0008I WOODW read with 0 errors" in the last few lines
-    if not result['stdout'][-800:].find("Coin0008I WOODW read with 0 errors") :
-      retVal = 1
-    # Look for pattern "<solver> solved NN out of 90 and took nnn seconds"
-    r=r'(solved \d+ out of 90 and took nnn seconds)'
-    osisSummaryResult=re.findall(r,result['stdout'][-800:])
-    print 'JP0'
-    for osi in osisSummaryResult :
-      print osi
-                       
-    
-    
-    
+
+    if project=='DyLP' and buildStep==NBprojectConfig.UNITTEST_CMD['Osi'] or \
+       project=='Osi'  and buildStep==NBprojectConfig.UNITTEST_CMD['Osi'] :
+
+      # Look for pattern "<solver> solved NN out of 90 and took nnn.xx seconds"
+      r=r'((.+) solved (\d+) out of 90 and took (\d*\.\d*) seconds)'
+      osisSummaryResult=re.findall(r,result['stdout'][-800:])
+      for osi in osisSummaryResult :
+        if int(osi[2])<90 :
+          #print osi[1]+" ran "+osi[2]+" out of 90 in "+osi[3]+" seconds"
+          retVal=1
 
   return retVal

branches/testScripts/NBprojectConfig.py

@@ -62 +62 @@
 #----------------------------------------------------------------------
 PROJECT_EMAIL_ADDRS['OS'] = 'kipp _DOT_ martin _AT_ chicagogsb _DOT_ edu'
+ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['OS'] = ['make test']
 
 #----------------------------------------------------------------------

branches/testScripts/NBuserConfig.py

@@ -110 +110 @@
             'FlopC++','Ipopt','OS','CppAD']
 
-PROJECTS = ['FlopC++','Ipopt','OS','CppAD']
-