Changeset 620

Timestamp:

Oct 15, 2007 10:28:40 PM (14 years ago)

Author:

jpfasano

Message:

Updated to run Cbc's unitTest

Location:

branches/testScripts

Files:

• NBprojectConfig.py (modified) (2 diffs)
• nightlyBuild.py (modified) (2 diffs)

branches/testScripts/NBprojectConfig.py

@@ -40 +40 @@
 PROJECT_EMAIL_ADDRS['Osi'] = 'mjs _AT_ ces _DOT_ clemson _DOT_ edu'
 UNITTEST_DIR['Osi'] = os.path.join('Osi','test')
-UNITTEST_CMD['Osi'] = './unitTest -testOsiSolverInterface' 
 UNITTEST_CMD['Osi'] = './unitTest -testOsiSolverInterface -netlibDir=_NETLIBDIR_ -cerr2cout' 
 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['Osi'] = ['make test',UNITTEST_CMD['Osi']]
@@ -50 +49 @@
 #----------------------------------------------------------------------
 PROJECT_EMAIL_ADDRS['Cbc'] = 'jjforre _AT_ us _DOT_ ibm _DOT_ com'
+UNITTEST_DIR['Cbc'] = os.path.join('Cbc','src')
+UNITTEST_CMD['Cbc'] = './cbc -unitTest -miplib -dirMiplib=_MIPLIB3DIR_' 
+
 
 #----------------------------------------------------------------------

branches/testScripts/nightlyBuild.py

@@ -58 +58 @@
       # message not found, assume test failed
       retVal = 1
+      
+  # Cbc's "make test"
   elif project=='Cbc' and buildStep=='make test' :
     # Check that last the last few lines are of the form
@@ -66 +68 @@
       # message not found, assume test failed
       retVal = 1
+
+  # Cbc's "./cbc -unitTest -miplib dirNetlib=_MIPLIB3DIR_"
+  elif project=='Cbc' and buildStep==NBprojectConfig.UNITTEST_CMD['Cbc'] :
+    if rc[0]>=0 and rc[0]<=2 :
+      # return code is between 0 and 2.
+      # Return code between 1 and 44 is the number of test cases that
+      # ended because maxnodes limit reached.  John Forrest says if this
+      # is less than 3, the OK.
+      retVal=0
+    else :
+      retVal=1
 
   return retVal