Changeset 765 for trunk/Cbc/test


Ignore:
Timestamp:
Aug 20, 2007 12:03:23 AM (14 years ago)
Author:
andreasw
Message:

merging changes from Bug Squashing Party Aug 2007 to regular trunk

Location:
trunk/Cbc/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/test/Makefile.am

    r640 r765  
    2727
    2828test_cbc: ../src/cbc$(EXEEXT)
    29         cd ../../Data/Netlib; make uncompress
    30         cd ../../Data/miplib3; make uncompress
    31         ../src/cbc$(EXEEXT) -unitTest -netlib -miplib
     29        if test x"$(DIRMIPLIB)" != x; then \
     30                MIPLIBARG="-dirMiplib $(DIRMIPLIB) -miplib"; \
     31        fi; \
     32        if test x"$(DIRSAMPLE)" != x; then \
     33                SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
     34        fi; \
     35        ../src/cbc$(EXEEXT) $$SAMPLEARG -unitTest $$MIPLIBARG
    3236
    3337test_cbc_generic: ../src/cbc-generic$(EXEEXT)
    3438        echo "A minimal test is all that cbc-generic can manage just yet."
    3539        ../src/cbc-generic$(EXEEXT) \
    36             -directory ../../Data/miplib3 -import p0033 -branch
     40            -directory ../../Data/Sample -import p0033 -branch
    3741
    3842.PHONY: test
  • trunk/Cbc/test/Makefile.in

    r710 r765  
    437437
    438438test_cbc: ../src/cbc$(EXEEXT)
    439         cd ../../Data/Netlib; make uncompress
    440         cd ../../Data/miplib3; make uncompress
    441         ../src/cbc$(EXEEXT) -unitTest -netlib -miplib
     439        if test x"$(DIRMIPLIB)" != x; then \
     440                MIPLIBARG="-dirMiplib $(DIRMIPLIB) -miplib"; \
     441        fi; \
     442        if test x"$(DIRSAMPLE)" != x; then \
     443                SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
     444        fi; \
     445        ../src/cbc$(EXEEXT) $$SAMPLEARG -unitTest $$MIPLIBARG
    442446
    443447test_cbc_generic: ../src/cbc-generic$(EXEEXT)
    444448        echo "A minimal test is all that cbc-generic can manage just yet."
    445449        ../src/cbc-generic$(EXEEXT) \
    446             -directory ../../Data/miplib3 -import p0033 -branch
     450            -directory ../../Data/Sample -import p0033 -branch
    447451
    448452.PHONY: test
Note: See TracChangeset for help on using the changeset viewer.