Changeset 599


Ignore:
Timestamp:
Oct 13, 2007 3:28:29 AM (12 years ago)
Author:
jpfasano
Message:

Modified to specify -netlibDir when running DyLP and Osi unitTest

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/nightlyBuild.py

    r598 r599  
    4848#PROJECT_EMAIL_ADDRS['DyLP'] = 'lou _AT_ cs _DOT_ sfu _DOT_ ca'
    4949UNITTEST_DIR['DyLP'] = os.path.join('Osi','test')
    50 UNITTEST_CMD['DyLP'] = './unitTest -testOsiSolverInterface'
     50UNITTEST_CMD['DyLP'] = './unitTest -testOsiSolverInterface -netlibDir=_NETLIBDIR_ -cerr2cout'
    5151ALL_TEST_COMPLETED_SUCCESSFULLY_CMDS['DyLP'] = ['make test']
    5252
    5353#PROJECT_EMAIL_ADDRS['Clp'] = 'jjforre _AT_ us _DOT_ ibm _DOT_ com'
    5454UNITTEST_DIR['Clp'] = os.path.join('Clp','src')
    55 UNITTEST_CMD['Clp'] = './clp -unitTest -netlib'
     55UNITTEST_CMD['Clp'] = './clp -unitTest -netlib dirNetlib=_NETLIBDIR_'
    5656ALL_TEST_COMPLETED_SUCCESSFULLY_CMDS['Clp'] = ['make test',UNITTEST_CMD['Clp']]
    5757
     
    6464UNITTEST_DIR['Osi'] = os.path.join('Osi','test')
    6565UNITTEST_CMD['Osi'] = './unitTest -testOsiSolverInterface'
     66UNITTEST_CMD['Osi'] = './unitTest -testOsiSolverInterface -netlibDir=_NETLIBDIR_ -cerr2cout'
    6667ALL_TEST_COMPLETED_SUCCESSFULLY_CMDS['Osi'] = ['make test',UNITTEST_CMD['Osi']]
    6768
     
    200201      sys.exit(1)
    201202    rc=commands.getstatusoutput('find '+d+' -name \*.gz -print | xargs gzip -d')
     203netlibDir=os.path.join(dataBaseDir,'Netlib')
     204miplib3Dir=os.path.join(dataBaseDir,'miplib3')
    202205
    203206#------------------------------------------------------------------------
     
    280283    os.chdir(unitTestPath)
    281284
    282     writeLogMessage( '  '+UNITTEST_CMD[p] )
    283     rc=commands.getstatusoutput(UNITTEST_CMD[p])
    284  
    285     if didTestFail(rc,p,UNITTEST_CMD[p]) :
    286       sendmail(p,rc[1],UNITTEST_CMD[p])
     285    unitTestCmd=UNITTEST_CMD[p]
     286    unitTestCmd=unitTestCmd.replace('_NETLIBDIR_',netlibDir)
     287    unitTestCmd=unitTestCmd.replace('_MIPLIB3DIR_',miplib3Dir)
     288
     289    writeLogMessage( '  '+unitTestCmd )
     290    rc=commands.getstatusoutput(unitTestCmd)
     291 
     292    if didTestFail(rc,p,unitTestCmd) :
     293      sendmail(p,rc[1],unitTestCmd)
    287294      continue
    288295
Note: See TracChangeset for help on using the changeset viewer.