Changeset 3803 for trunk/test_more


Ignore:
Timestamp:
Mar 19, 2016 1:07:48 AM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: d75b0cba62a41b958b974a326168299773bc4614
end hash code: 8dd8b10d36b325a3f4bbf3c03f1ea00e288331ae

commit 8dd8b10d36b325a3f4bbf3c03f1ea00e288331ae
Author: Brad Bell <bradbell@…>
Date: Fri Mar 18 20:25:17 2016 -0700

  1. replace multiple */test_one.sh.in by one bin/test_one.sh.
  2. remove test_one.sh.in from auto-tools build.

commit e524af11d04938103d42963e393b3637616dc278
Author: Brad Bell <bradbell@…>
Date: Fri Mar 18 10:02:38 2016 -0700

Move solve.cpp -> ipopt_solve.cpp so has same name as its directory.

commit 4714099e4eef9226536760e206f988440eec2f48
Author: Brad Bell <bradbell@…>
Date: Fri Mar 18 09:50:37 2016 -0700

Use system include option to supress all warnings in eigen and fadbad source.

Location:
trunk/test_more
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/test_more/CMakeLists.txt

    r3793 r3803  
    4646        SET(eigen_libs "")
    4747ENDIF ( eigen_prefix )
    48 
    49 # Copy a file to another location and modify its contents.
    50 # configure_file(InputFile OutputFile [COPYONLY] [ESCAPE_QUOTES] [@ONLY])
    51 CONFIGURE_FILE(
    52         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh.in
    53         ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh
    54 )
    5548
    5649# add_executable(<name> [WIN32] [MACOSX_BUNDLE] [EXCLUDE_FROM_ALL]
  • trunk/test_more/makefile.am

    r3793 r3803  
    6565# Microsoft project files and script to run a single test
    6666EXTRA_DIST        =  \
    67         test_one.sh.in  \
    6867        $(ADOLC_EXTRA_FILES) \
    6968        $(IPOPT_EXTRA_FILES) \
  • trunk/test_more/makefile.in

    r3794 r3803  
    9797DIST_COMMON = $(srcdir)/makefile.am $(am__DIST_COMMON)
    9898mkinstalldirs = $(install_sh) -d
    99 CONFIG_CLEAN_FILES = test_one.sh
     99CONFIG_CLEAN_FILES =
    100100CONFIG_CLEAN_VPATH_FILES =
    101101LIBRARIES = $(noinst_LIBRARIES)
     
    256256ETAGS = etags
    257257CTAGS = ctags
    258 am__DIST_COMMON = $(srcdir)/makefile.in $(srcdir)/test_one.sh.in \
    259         $(top_srcdir)/depcomp
     258am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/depcomp
    260259DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    261260ABS_TOP_BUILDDIR = @ABS_TOP_BUILDDIR@
     
    474473# Microsoft project files and script to run a single test
    475474EXTRA_DIST = \
    476         test_one.sh.in  \
    477475        $(ADOLC_EXTRA_FILES) \
    478476        $(IPOPT_EXTRA_FILES) \
     
    631629        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    632630$(am__aclocal_m4_deps):
    633 test_one.sh: $(top_builddir)/config.status $(srcdir)/test_one.sh.in
    634         cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
    635631
    636632clean-noinstLIBRARIES:
Note: See TracChangeset for help on using the changeset viewer.