Ignore:
Timestamp:
Mar 30, 2007 5:16:44 PM (14 years ago)
Author:
lou
Message:

Configuration and makefile changes for cbc-generic.

Location:
branches/devel/Cbc/test
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/devel/Cbc/test/Makefile.am

    r372 r592  
    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)
     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)
    1829        cd ../../Data/Netlib; make uncompress
    1930        cd ../../Data/miplib3; make uncompress
    20         ../src/cbc-generic$(EXEEXT) -miplib -unitTest
    21         ../src/cbc$(EXEEXT) -unitTest -netlib
     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

  • branches/devel/Cbc/test/Makefile.in

    r547 r592  
    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)
     432# We are using the solver executables to do the unit test
     433
     434test: $(CBC_TEST_TGTS)
     435
     436test_cbc: ../src/cbc$(EXEEXT)
    430437        cd ../../Data/Netlib; make uncompress
    431438        cd ../../Data/miplib3; make uncompress
    432         ../src/cbc-generic$(EXEEXT) -miplib -unitTest
    433         ../src/cbc$(EXEEXT) -unitTest -netlib
     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.