Changeset 3803 for trunk/test_more

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:

• CMakeLists.txt (modified) (1 diff)
• makefile.am (modified) (1 diff)
• makefile.in (modified) (4 diffs)
• test_one.sh.in (deleted)

trunk/test_more/CMakeLists.txt

@@ -46 +46 @@
         SET(eigen_libs "")
 ENDIF ( eigen_prefix )
-
-# Copy a file to another location and modify its contents.
-# configure_file(InputFile OutputFile [COPYONLY] [ESCAPE_QUOTES] [@ONLY])
-CONFIGURE_FILE(
-        ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh.in
-        ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh
-)
 
 # add_executable(<name> [WIN32] [MACOSX_BUNDLE] [EXCLUDE_FROM_ALL]

trunk/test_more/makefile.am

@@ -65 +65 @@
 # Microsoft project files and script to run a single test
 EXTRA_DIST        =  \
-        test_one.sh.in  \
         $(ADOLC_EXTRA_FILES) \
         $(IPOPT_EXTRA_FILES) \

trunk/test_more/makefile.in

@@ -97 +97 @@
 DIST_COMMON = $(srcdir)/makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = test_one.sh
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -256 +256 @@
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/makefile.in $(srcdir)/test_one.sh.in \
-        $(top_srcdir)/depcomp
+am__DIST_COMMON = $(srcdir)/makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ABS_TOP_BUILDDIR = @ABS_TOP_BUILDDIR@
@@ -474 +473 @@
 # Microsoft project files and script to run a single test
 EXTRA_DIST = \
-        test_one.sh.in  \
         $(ADOLC_EXTRA_FILES) \
         $(IPOPT_EXTRA_FILES) \
@@ -631 +629 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-test_one.sh: $(top_builddir)/config.status $(srcdir)/test_one.sh.in
-        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 clean-noinstLIBRARIES: