Changeset 1559 for trunk/Clp/test


Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (10 years ago)
Author:
stefan
Message:

merge split branch into trunk

Location:
trunk
Files:
3 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.6
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        5 Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        6 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        7 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1522,​1527-1531,​1542-1550,​1558
  • trunk/Clp/test/Makefile.am

    r1088 r1559  
    1010
    1111########################################################################
     12#                         unitTest for OsiClp                          #
     13########################################################################
     14
     15if COIN_HAS_OSITESTS
     16
     17noinst_PROGRAMS = osiUnitTest
     18
     19osiUnitTest_SOURCES = osiUnitTest.cpp OsiClpSolverInterfaceTest.cpp
     20
     21osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
     22
     23LIBS += $(COINUTILS_LIBS) $(OSITESTS_LIBS)
     24
     25AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSITESTS_CFLAGS) \
     26        -I`$(CYGPATH_W) $(srcdir)/../src` \
     27        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
     28
     29testdepend =  osiUnitTest$(EXEEXT)
     30endif
     31
     32########################################################################
    1233#                         unitTest for Clp                             #
    1334########################################################################
    1435
     36unittestflags =
     37osiunittestflags =
     38if COIN_HAS_SAMPLE
     39  unittestflags += -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
     40  osiunittestflags += -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
     41endif
     42unittestflags += -unitTest
     43if COIN_HAS_NETLIB
     44  unittestflags += -dirNetlib `$(CYGPATH_W) $(NETLIB_DATA)` -netlib
     45  osiunittestflags += -netlibDir=`$(CYGPATH_W) $(NETLIB_DATA)` -testOsiSolverInterface
     46endif
     47
    1548# We are using the CLP solver executable to do the unit test
    16 test: ../src/clp$(EXEEXT)
    17         if test x"$(DIRNETLIB)" != x; then \
    18                 NETLIBARG="-dirNetlib $(DIRNETLIB) -netlib"; \
    19         fi; \
    20         if test x"$(DIRSAMPLE)" != x; then \
    21                 SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
    22         fi; \
    23         ../src/clp$(EXEEXT) $$SAMPLEARG -unitTest $$NETLIBARG
     49test: ../src/clp$(EXEEXT) $(testdepend)
     50        ../src/clp$(EXEEXT) $(unittestflags) || exit 1
     51        if test -e osiUnitTest$(EXEEXT) ; then \
     52          ./osiUnitTest$(EXEEXT) $(osiunittestflags) || exit 1 ; \
     53        fi
    2454
    2555.PHONY: test
  • trunk/Clp/test/Makefile.in

    r1155 r1559  
    2020
    2121# Author:  Andreas Waechter           IBM    2006-04-13
     22
    2223srcdir = @srcdir@
    2324top_srcdir = @top_srcdir@
     
    4243build_triplet = @build@
    4344host_triplet = @host@
     45@COIN_HAS_OSITESTS_TRUE@noinst_PROGRAMS = osiUnitTest$(EXEEXT)
     46@COIN_HAS_OSITESTS_TRUE@am__append_1 = $(COINUTILS_LIBS) $(OSITESTS_LIBS)
     47@COIN_HAS_SAMPLE_TRUE@am__append_2 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
     48@COIN_HAS_SAMPLE_TRUE@am__append_3 = -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
     49@COIN_HAS_NETLIB_TRUE@am__append_4 = -dirNetlib `$(CYGPATH_W) $(NETLIB_DATA)` -netlib
     50@COIN_HAS_NETLIB_TRUE@am__append_5 = -netlibDir=`$(CYGPATH_W) $(NETLIB_DATA)` -testOsiSolverInterface
    4451subdir = test
    4552DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    5259CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
    5360CONFIG_CLEAN_FILES =
    54 SOURCES =
    55 DIST_SOURCES =
     61PROGRAMS = $(noinst_PROGRAMS)
     62am__osiUnitTest_SOURCES_DIST = osiUnitTest.cpp \
     63        OsiClpSolverInterfaceTest.cpp
     64@COIN_HAS_OSITESTS_TRUE@am_osiUnitTest_OBJECTS =  \
     65@COIN_HAS_OSITESTS_TRUE@        osiUnitTest.$(OBJEXT) \
     66@COIN_HAS_OSITESTS_TRUE@        OsiClpSolverInterfaceTest.$(OBJEXT)
     67osiUnitTest_OBJECTS = $(am_osiUnitTest_OBJECTS)
     68@COIN_HAS_OSITESTS_TRUE@osiUnitTest_DEPENDENCIES = ../src/libClp.la \
     69@COIN_HAS_OSITESTS_TRUE@        ../src/OsiClp/libOsiClp.la
     70DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
     71depcomp = $(SHELL) $(top_srcdir)/../depcomp
     72am__depfiles_maybe = depfiles
     73CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     74        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     75LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
     76        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     77        $(AM_CXXFLAGS) $(CXXFLAGS)
     78CXXLD = $(CXX)
     79CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     80        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     81SOURCES = $(osiUnitTest_SOURCES)
     82DIST_SOURCES = $(am__osiUnitTest_SOURCES_DIST)
     83ETAGS = etags
     84CTAGS = ctags
    5685DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     86ABSBUILDDIR = @ABSBUILDDIR@
    5787ACLOCAL = @ACLOCAL@
    5888ADDLIBS = @ADDLIBS@
     
    75105CDEFS = @CDEFS@
    76106CFLAGS = @CFLAGS@
    77 CLPDOCDIR = @CLPDOCDIR@
    78 CLPOBJDIR = @CLPOBJDIR@
    79 CLPSRCDIR = @CLPSRCDIR@
    80 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    81 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    82 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    83 COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    84 COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
     107COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
     108COINUTILS_DATA = @COINUTILS_DATA@
     109COINUTILS_LIBS = @COINUTILS_LIBS@
    85110COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    86111COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
     112COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
     113COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     114COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
     115COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     116COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
     117COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
     118COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     119COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     120COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
     121COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
     122COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    87123CPP = @CPP@
    88124CPPFLAGS = @CPPFLAGS@
     
    115151LIBEXT = @LIBEXT@
    116152LIBOBJS = @LIBOBJS@
    117 LIBS = @LIBS@
     153LIBS = @LIBS@ $(am__append_1)
    118154LIBTOOL = @LIBTOOL@
    119155LIBTOOLM4 = @LIBTOOLM4@
     
    127163MPICC = @MPICC@
    128164MPICXX = @MPICXX@
     165NETLIB_CFLAGS = @NETLIB_CFLAGS@
     166NETLIB_DATA = @NETLIB_DATA@
     167NETLIB_LIBS = @NETLIB_LIBS@
    129168OBJEXT = @OBJEXT@
    130169OPT_CFLAGS = @OPT_CFLAGS@
    131170OPT_CXXFLAGS = @OPT_CXXFLAGS@
     171OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     172OSITESTS_DATA = @OSITESTS_DATA@
     173OSITESTS_LIBS = @OSITESTS_LIBS@
     174OSI_CFLAGS = @OSI_CFLAGS@
     175OSI_DATA = @OSI_DATA@
     176OSI_LIBS = @OSI_LIBS@
    132177PACKAGE = @PACKAGE@
    133178PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    137182PACKAGE_VERSION = @PACKAGE_VERSION@
    138183PATH_SEPARATOR = @PATH_SEPARATOR@
     184PKG_CONFIG = @PKG_CONFIG@
    139185RANLIB = @RANLIB@
     186REQUIREDPACKAGES = @REQUIREDPACKAGES@
    140187RPATH_FLAGS = @RPATH_FLAGS@
     188SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     189SAMPLE_DATA = @SAMPLE_DATA@
     190SAMPLE_LIBS = @SAMPLE_LIBS@
    141191SET_MAKE = @SET_MAKE@
    142192SHELL = @SHELL@
     
    144194VERSION = @VERSION@
    145195VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
     196_SVN_REV = @_SVN_REV@
    146197abs_bin_dir = @abs_bin_dir@
    147198abs_include_dir = @abs_include_dir@
     
    156207ac_ct_STRIP = @ac_ct_STRIP@
    157208ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     209ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    158210am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    159211am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    176228have_automake = @have_automake@
    177229have_svn = @have_svn@
     230have_svnversion = @have_svnversion@
    178231host = @host@
    179232host_alias = @host_alias@
     
    198251target_alias = @target_alias@
    199252AUTOMAKE_OPTIONS = foreign
     253@COIN_HAS_OSITESTS_TRUE@osiUnitTest_SOURCES = osiUnitTest.cpp OsiClpSolverInterfaceTest.cpp
     254@COIN_HAS_OSITESTS_TRUE@osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
     255@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSITESTS_CFLAGS) \
     256@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src` \
     257@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
     258
     259@COIN_HAS_OSITESTS_TRUE@testdepend = osiUnitTest$(EXEEXT)
     260
     261########################################################################
     262#                         unitTest for Clp                             #
     263########################################################################
     264unittestflags = $(am__append_2) -unitTest $(am__append_4)
     265osiunittestflags = $(am__append_3) $(am__append_5)
    200266
    201267########################################################################
     
    209275
    210276.SUFFIXES:
     277.SUFFIXES: .cpp .lo .o .obj
    211278$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
    212279        @for dep in $?; do \
     
    239306        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    240307
     308clean-noinstPROGRAMS:
     309        @list='$(noinst_PROGRAMS)'; for p in $$list; do \
     310          f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
     311          echo " rm -f $$p $$f"; \
     312          rm -f $$p $$f ; \
     313        done
     314osiUnitTest$(EXEEXT): $(osiUnitTest_OBJECTS) $(osiUnitTest_DEPENDENCIES)
     315        @rm -f osiUnitTest$(EXEEXT)
     316        $(CXXLINK) $(osiUnitTest_LDFLAGS) $(osiUnitTest_OBJECTS) $(osiUnitTest_LDADD) $(LIBS)
     317
     318mostlyclean-compile:
     319        -rm -f *.$(OBJEXT)
     320
     321distclean-compile:
     322        -rm -f *.tab.c
     323
     324@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OsiClpSolverInterfaceTest.Po@am__quote@
     325@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osiUnitTest.Po@am__quote@
     326
     327.cpp.o:
     328@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     329@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     330@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     331@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     332@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
     333
     334.cpp.obj:
     335@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
     336@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     337@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     338@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     339@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     340
     341.cpp.lo:
     342@am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     343@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     344@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     345@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     346@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
     347
    241348mostlyclean-libtool:
    242349        -rm -f *.lo
     
    248355        -rm -f libtool
    249356uninstall-info-am:
     357
     358ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
     359        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     360        unique=`for i in $$list; do \
     361            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     362          done | \
     363          $(AWK) '    { files[$$0] = 1; } \
     364               END { for (i in files) print i; }'`; \
     365        mkid -fID $$unique
    250366tags: TAGS
    251 TAGS:
    252 
     367
     368TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     369                $(TAGS_FILES) $(LISP)
     370        tags=; \
     371        here=`pwd`; \
     372        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
     373        unique=`for i in $$list; do \
     374            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     375          done | \
     376          $(AWK) '    { files[$$0] = 1; } \
     377               END { for (i in files) print i; }'`; \
     378        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     379          test -n "$$unique" || unique=$$empty_fix; \
     380          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     381            $$tags $$unique; \
     382        fi
    253383ctags: CTAGS
    254 CTAGS:
    255 
     384CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     385                $(TAGS_FILES) $(LISP)
     386        tags=; \
     387        here=`pwd`; \
     388        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
     389        unique=`for i in $$list; do \
     390            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     391          done | \
     392          $(AWK) '    { files[$$0] = 1; } \
     393               END { for (i in files) print i; }'`; \
     394        test -z "$(CTAGS_ARGS)$$tags$$unique" \
     395          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
     396             $$tags $$unique
     397
     398GTAGS:
     399        here=`$(am__cd) $(top_builddir) && pwd` \
     400          && cd $(top_srcdir) \
     401          && gtags -i $(GTAGS_ARGS) $$here
     402
     403distclean-tags:
     404        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
    256405
    257406distdir: $(DISTFILES)
     
    284433check-am: all-am
    285434check: check-am
    286 all-am: Makefile
     435all-am: Makefile $(PROGRAMS)
    287436installdirs:
    288437install: install-am
     
    313462clean: clean-am
    314463
    315 clean-am: clean-generic clean-libtool mostlyclean-am
     464clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
     465        mostlyclean-am
    316466
    317467distclean: distclean-am
     468        -rm -rf ./$(DEPDIR)
    318469        -rm -f Makefile
    319 distclean-am: clean-am distclean-generic distclean-libtool
     470distclean-am: clean-am distclean-compile distclean-generic \
     471        distclean-libtool distclean-tags
    320472
    321473dvi: dvi-am
     
    340492
    341493maintainer-clean: maintainer-clean-am
     494        -rm -rf ./$(DEPDIR)
    342495        -rm -f Makefile
    343496maintainer-clean-am: distclean-am maintainer-clean-generic
     
    345498mostlyclean: mostlyclean-am
    346499
    347 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
     500mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     501        mostlyclean-libtool
    348502
    349503pdf: pdf-am
     
    357511uninstall-am: uninstall-info-am
    358512
    359 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
    360         distclean distclean-generic distclean-libtool distdir dvi \
    361         dvi-am html html-am info info-am install install-am \
    362         install-data install-data-am install-exec install-exec-am \
    363         install-info install-info-am install-man install-strip \
    364         installcheck installcheck-am installdirs maintainer-clean \
    365         maintainer-clean-generic mostlyclean mostlyclean-generic \
    366         mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
     513.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     514        clean-libtool clean-noinstPROGRAMS ctags distclean \
     515        distclean-compile distclean-generic distclean-libtool \
     516        distclean-tags distdir dvi dvi-am html html-am info info-am \
     517        install install-am install-data install-data-am install-exec \
     518        install-exec-am install-info install-info-am install-man \
     519        install-strip installcheck installcheck-am installdirs \
     520        maintainer-clean maintainer-clean-generic mostlyclean \
     521        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     522        pdf pdf-am ps ps-am tags uninstall uninstall-am \
    367523        uninstall-info-am
    368524
    369525
    370 ########################################################################
    371 #                         unitTest for Clp                             #
    372 ########################################################################
    373 
    374526# We are using the CLP solver executable to do the unit test
    375 test: ../src/clp$(EXEEXT)
    376         if test x"$(DIRNETLIB)" != x; then \
    377                 NETLIBARG="-dirNetlib $(DIRNETLIB) -netlib"; \
    378         fi; \
    379         if test x"$(DIRSAMPLE)" != x; then \
    380                 SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
    381         fi; \
    382         ../src/clp$(EXEEXT) $$SAMPLEARG -unitTest $$NETLIBARG
     527test: ../src/clp$(EXEEXT) $(testdepend)
     528        ../src/clp$(EXEEXT) $(unittestflags) || exit 1
     529        if test -e osiUnitTest$(EXEEXT) ; then \
     530          ./osiUnitTest$(EXEEXT) $(osiunittestflags) || exit 1 ; \
     531        fi
    383532
    384533.PHONY: test
Note: See TracChangeset for help on using the changeset viewer.