Changeset 640 for trunk/Cbc/test


Ignore:
Timestamp:
Jun 26, 2007 5:17:15 AM (13 years ago)
Author:
forrest
Message:

trunk from branches/devel

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 MSVisualStudio   https://projects.coin-or.org/svn/MSVisualStudio/trunk/ExternalsDirs/Cbc
        2 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.5
         1MSVisualStudio   https://projects.coin-or.org/svn/MSVisualStudio/branches/devel/ExternalsDirs/Cbc
         2BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
        33ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
         4ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
         5ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        46Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        57Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
  • trunk/Cbc/test/Makefile.am

    r527 r640  
    1313########################################################################
    1414
    15 # We are using the Cbc solver executable to do the unit test
     15CBC_TEST_TGTS =
    1616
    17 test: ../src/cbc-generic$(EXEEXT) ../src/cbc$(EXEEXT)
    18         cd ../../Data/Netlib; $(MAKE) uncompress
    19         cd ../../Data/miplib3; $(MAKE) uncompress
    20         ../src/cbc-generic$(EXEEXT) -miplib -unitTest
    21         ../src/cbc$(EXEEXT) -unitTest -netlib
     17if COIN_HAS_CLP
     18  CBC_TEST_TGTS += test_cbc
     19endif
     20if CBC_BUILD_CBC_GENERIC
     21  CBC_TEST_TGTS += test_cbc_generic
     22endif
     23
     24# We are using the solver executables to do the unit test
     25
     26test: $(CBC_TEST_TGTS)
     27
     28test_cbc: ../src/cbc$(EXEEXT)
     29        cd ../../Data/Netlib; make uncompress
     30        cd ../../Data/miplib3; make uncompress
     31        ../src/cbc$(EXEEXT) -unitTest -netlib -miplib
     32
     33test_cbc_generic: ../src/cbc-generic$(EXEEXT)
     34        echo "A minimal test is all that cbc-generic can manage just yet."
     35        ../src/cbc-generic$(EXEEXT) \
     36            -directory ../../Data/miplib3 -import p0033 -branch
    2237
    2338.PHONY: test
  • trunk/Cbc/test/Makefile.in

    r527 r640  
    4242build_triplet = @build@
    4343host_triplet = @host@
     44@COIN_HAS_CLP_TRUE@am__append_1 = test_cbc
     45@CBC_BUILD_CBC_GENERIC_TRUE@am__append_2 = test_cbc_generic
    4446subdir = test
    4547DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    7577CBCOBJDIR = @CBCOBJDIR@
    7678CBCSRCDIR = @CBCSRCDIR@
     79CBC_BUILD_CBC_GENERIC_FALSE = @CBC_BUILD_CBC_GENERIC_FALSE@
     80CBC_BUILD_CBC_GENERIC_TRUE = @CBC_BUILD_CBC_GENERIC_TRUE@
    7781CC = @CC@
    7882CCDEPMODE = @CCDEPMODE@
     
    253257
    254258########################################################################
     259#                         unitTest for Cbc                             #
     260########################################################################
     261CBC_TEST_TGTS = $(am__append_1) $(am__append_2)
     262
     263########################################################################
    255264#                          Cleaning stuff                              #
    256265########################################################################
     
    421430
    422431
    423 ########################################################################
    424 #                         unitTest for Cbc                             #
    425 ########################################################################
    426 
    427 # We are using the Cbc solver executable to do the unit test
    428 
    429 test: ../src/cbc-generic$(EXEEXT) ../src/cbc$(EXEEXT)
    430         cd ../../Data/Netlib; $(MAKE) uncompress
    431         cd ../../Data/miplib3; $(MAKE) uncompress
    432         ../src/cbc-generic$(EXEEXT) -miplib -unitTest
    433         ../src/cbc$(EXEEXT) -unitTest -netlib
     432# We are using the solver executables to do the unit test
     433
     434test: $(CBC_TEST_TGTS)
     435
     436test_cbc: ../src/cbc$(EXEEXT)
     437        cd ../../Data/Netlib; make uncompress
     438        cd ../../Data/miplib3; make uncompress
     439        ../src/cbc$(EXEEXT) -unitTest -netlib -miplib
     440
     441test_cbc_generic: ../src/cbc-generic$(EXEEXT)
     442        echo "A minimal test is all that cbc-generic can manage just yet."
     443        ../src/cbc-generic$(EXEEXT) \
     444            -directory ../../Data/miplib3 -import p0033 -branch
    434445
    435446.PHONY: test
Note: See TracChangeset for help on using the changeset viewer.