Changeset 599

Timestamp:

Oct 13, 2007 3:28:29 AM (14 years ago)

Author:

jpfasano

Message:

Modified to specify -netlibDir when running DyLP and Osi unitTest

File:

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

branches/testScripts/nightlyBuild.py

@@ -48 +48 @@
 #PROJECT_EMAIL_ADDRS['DyLP'] = 'lou _AT_ cs _DOT_ sfu _DOT_ ca'
 UNITTEST_DIR['DyLP'] = os.path.join('Osi','test')
-UNITTEST_CMD['DyLP'] = './unitTest -testOsiSolverInterface' 
+UNITTEST_CMD['DyLP'] = './unitTest -testOsiSolverInterface -netlibDir=_NETLIBDIR_ -cerr2cout' 
 ALL_TEST_COMPLETED_SUCCESSFULLY_CMDS['DyLP'] = ['make test']
 
 #PROJECT_EMAIL_ADDRS['Clp'] = 'jjforre _AT_ us _DOT_ ibm _DOT_ com'
 UNITTEST_DIR['Clp'] = os.path.join('Clp','src')
-UNITTEST_CMD['Clp'] = './clp -unitTest -netlib' 
+UNITTEST_CMD['Clp'] = './clp -unitTest -netlib dirNetlib=_NETLIBDIR_' 
 ALL_TEST_COMPLETED_SUCCESSFULLY_CMDS['Clp'] = ['make test',UNITTEST_CMD['Clp']]
 
@@ -64 +64 @@
 UNITTEST_DIR['Osi'] = os.path.join('Osi','test')
 UNITTEST_CMD['Osi'] = './unitTest -testOsiSolverInterface' 
+UNITTEST_CMD['Osi'] = './unitTest -testOsiSolverInterface -netlibDir=_NETLIBDIR_ -cerr2cout' 
 ALL_TEST_COMPLETED_SUCCESSFULLY_CMDS['Osi'] = ['make test',UNITTEST_CMD['Osi']]
 
@@ -200 +201 @@
       sys.exit(1)
     rc=commands.getstatusoutput('find '+d+' -name \*.gz -print | xargs gzip -d')
+netlibDir=os.path.join(dataBaseDir,'Netlib')
+miplib3Dir=os.path.join(dataBaseDir,'miplib3')
 
 #------------------------------------------------------------------------
@@ -280 +283 @@
     os.chdir(unitTestPath)
 
-    writeLogMessage( '  '+UNITTEST_CMD[p] )
-    rc=commands.getstatusoutput(UNITTEST_CMD[p])
-  
-    if didTestFail(rc,p,UNITTEST_CMD[p]) :
-      sendmail(p,rc[1],UNITTEST_CMD[p])
+    unitTestCmd=UNITTEST_CMD[p]
+    unitTestCmd=unitTestCmd.replace('_NETLIBDIR_',netlibDir)
+    unitTestCmd=unitTestCmd.replace('_MIPLIB3DIR_',miplib3Dir)
+
+    writeLogMessage( '  '+unitTestCmd )
+    rc=commands.getstatusoutput(unitTestCmd)
+  
+    if didTestFail(rc,p,unitTestCmd) :
+      sendmail(p,rc[1],unitTestCmd)
       continue