Ignore:
Timestamp:
Nov 2, 2007 9:55:56 AM (13 years ago)
Author:
jpfasano
Message:

Mofified NBcheckResult so that it is a bunch of small functions that check for one specific thing.
NBprojectConfig now defines a dictionary where the key is the project.
The value is a list of functions that need to be run to check the success of a particular test run.
The code still needs to be cleaned up, but it seems to be running and was time to do a check-in so I can move it to other platforms for testing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBprojectConfig.py

    r721 r730  
    2626#----------------------------------------------------------------------
    2727PROJECT_EMAIL_ADDRS['CoinUtils'] = 'ladanyi _AT_ us _DOT_ ibm _DOT_ com'
    28 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['CoinUtils'] = ['make test']
    29 CHECK_MAKE_TEST['CoinUtils']=[NBcheckResult.rc0,NBcheckResult.standardSuccessMessage]
     28CHECK_MAKE_TEST['CoinUtils']=[NBcheckResult.rc0,
     29                              NBcheckResult.standardSuccessMessage]
    3030#does not have references to third party packages
    3131
     
    3434UNITTEST_DIR['DyLP'] = os.path.join('Osi','test')
    3535UNITTEST_CMD['DyLP'] = './unitTest -testOsiSolverInterface -netlibDir=_NETLIBDIR_ -cerr2cout'
    36 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['DyLP'] = ['make test']
     36CHECK_MAKE_TEST['DyLP']=[
     37                         NBcheckResult.rc0,
     38                         NBcheckResult.standardSuccessMessage,
     39                         NBcheckResult.noSolverInterfaceTestingIssueMessage]
     40CHECK_UNITTEST['DyLP']=[
     41                         NBcheckResult.rc0,
     42                         NBcheckResult.standardSuccessMessage,
     43                         NBcheckResult.noSolverInterfaceTestingIssueMessage]
    3744#does not have references to third party packages
    3845
     
    4148UNITTEST_DIR['Clp'] = os.path.join('Clp','src')
    4249UNITTEST_CMD['Clp'] = './clp -unitTest dirNetlib=_NETLIBDIR_ -netlib'
    43 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['Clp'] = ['make test',UNITTEST_CMD['Clp']]
     50CHECK_MAKE_TEST['Clp']=[
     51                         NBcheckResult.rc0,
     52                         NBcheckResult.standardSuccessMessage]
     53CHECK_UNITTEST['Clp']=[
     54                         NBcheckResult.rc0,
     55                         NBcheckResult.standardSuccessMessage,
     56                         NBcheckResult.endWithWoodw]
    4457
    4558#----------------------------------------------------------------------
    4659PROJECT_EMAIL_ADDRS['SYMPHONY'] = 'tkr2 _AT_ lehigh _DOT_ edu'
    47 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['SYMPHONY'] = ['make test']
     60CHECK_MAKE_TEST['SYMPHONY']=[
     61                         NBcheckResult.rc0,
     62                         NBcheckResult.standardSuccessMessage]
     63UNITTEST_DIR['SYMPHONY'] = '.'
     64UNITTEST_CMD['SYMPHONY'] = 'make fulltest'
     65CHECK_UNITTEST['SYMPHONY']=[
     66                         NBcheckResult.rc0,
     67                         NBcheckResult.standardSuccessMessage,
     68                         ]
    4869
    4970#----------------------------------------------------------------------
    5071PROJECT_EMAIL_ADDRS['Vol'] = 'barahon _AT_ us _DOT_ ibm _DOT_ com'
     72CHECK_MAKE_TEST['Vol']=[
     73                         NBcheckResult.rc0]
    5174#does not have references to third party packages
    5275
     
    5578UNITTEST_DIR['Osi'] = os.path.join('Osi','test')
    5679UNITTEST_CMD['Osi'] = './unitTest -testOsiSolverInterface -netlibDir=_NETLIBDIR_ -cerr2cout'
    57 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['Osi'] = ['make test',UNITTEST_CMD['Osi']]
     80CHECK_MAKE_TEST['Osi']=[
     81                         NBcheckResult.rc0,
     82                         NBcheckResult.standardSuccessMessage,
     83                         NBcheckResult.noSolverInterfaceTestingIssueMessage]
     84CHECK_UNITTEST['Osi']=[
     85                         NBcheckResult.rc0,
     86                         NBcheckResult.standardSuccessMessage,
     87                         NBcheckResult.noSolverInterfaceTestingIssueMessage]
    5888
    5989#----------------------------------------------------------------------
    6090PROJECT_EMAIL_ADDRS['Cgl'] = 'robinlh _AT_ us _DOT_ ibm _DOT_ com'
    61 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['Cgl'] = ['make test']
     91CHECK_MAKE_TEST['Cgl']=[
     92                         NBcheckResult.rc0,
     93                         NBcheckResult.standardSuccessMessage]
    6294#does not have references to third party packages
    6395
     
    6698UNITTEST_DIR['Cbc'] = os.path.join('Cbc','src')
    6799UNITTEST_CMD['Cbc'] = './cbc -unitTest -dirMiplib=_MIPLIB3DIR_ -miplib'
     100CHECK_MAKE_TEST['Cbc']=[
     101                         NBcheckResult.rc0,
     102                         NBcheckResult.cbcMakeTestSuccessMessage]
     103CHECK_UNITTEST['Cbc']=[ NBcheckResult.rc0to2 ]
    68104
    69105#----------------------------------------------------------------------
    70106PROJECT_EMAIL_ADDRS['Ipopt'] = 'andreasw _AT_ us _DOT_ ibm _DOT_ com'
     107CHECK_MAKE_TEST['Ipopt']=[NBcheckResult.rc0
     108                         # ,NBcheckResult.standardSuccessMessage
     109                         ]
    71110#third party packages are not optional here
    72111
    73112#----------------------------------------------------------------------
    74113PROJECT_EMAIL_ADDRS['Bonmin'] = 'pbonami _AT_ us _DOT_ ibm _DOT_ com'
     114CHECK_MAKE_TEST['Bonmin']=[NBcheckResult.rc0
     115                          ,NBcheckResult.standardSuccessMessage
     116                          ]
    75117#third party packages are not optional here
    76118
    77119#----------------------------------------------------------------------
    78120PROJECT_EMAIL_ADDRS['FlopC++'] = 'Tim _DOT_ Hultberg _AT_ eumetsat _DOT_ int'
    79 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['FlopC++'] = ['make test']
     121CHECK_MAKE_TEST['FlopC++']=[
     122                         NBcheckResult.rc0,
     123                         NBcheckResult.standardSuccessMessage]
    80124#does not have references to third party packages
    81125
    82126#----------------------------------------------------------------------
    83127PROJECT_EMAIL_ADDRS['OS'] = 'kipp _DOT_ martin _AT_ chicagogsb _DOT_ edu'
    84 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['OS'] = ['make test']
     128CHECK_MAKE_TEST['OS']=[
     129                         NBcheckResult.rc0,
     130                         NBcheckResult.standardSuccessMessage]
    85131#third party packages are not optional if Ipopt is not excluded
    86132
    87133#----------------------------------------------------------------------
    88134PROJECT_EMAIL_ADDRS['CppAD'] = 'bradbell _AT_ washington _DOT_ edu'
     135CHECK_MAKE_TEST['CppAD']=[NBcheckResult.anythingGoes]
     136UNITTEST_DIR['CppAD'] = os.path.join('.')
     137UNITTEST_CMD['CppAD'] = './example/example'
     138CHECK_UNITTEST['CppAD']=[NBcheckResult.rc0]
    89139#does not have references to third party packages
    90140
    91141#----------------------------------------------------------------------
    92142PROJECT_EMAIL_ADDRS['Smi'] = 'kingaj _AT_ us _DOT_ ibm _DOT_ com'
     143CHECK_MAKE_TEST['Smi']=[
     144                         NBcheckResult.rc0,
     145                         NBcheckResult.standardSuccessMessage]
    93146#does not have references to third party packages
    94147#TODO: need some check whether make test was successful; what is the behaviour in Smi's unittest if it fails?
Note: See TracChangeset for help on using the changeset viewer.