Changeset 3935


Ignore:
Timestamp:
May 19, 2017 9:56:56 PM (2 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 59032b5b7861ee32953478a68b477c42445eaad7
end hash code: 4f7a9e1bd57be3d81361ce359222bd61f26e2a79

commit 4f7a9e1bd57be3d81361ce359222bd61f26e2a79
Author: Brad Bell <bradbell@…>
Date: Fri May 19 18:50:24 2017 -0700

Move compare_c -> test_more/compare_c.

commit 7cd305684b06892664571e312277f94c2f0dcd1c
Author: Brad Bell <bradbell@…>
Date: Fri May 19 17:32:15 2017 -0700

Specify separate built type for each test_more subdirectory.

Location:
trunk
Files:
1 added
1 deleted
10 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3932 r3935  
    283283# directories with check depends entries
    284284ADD_SUBDIRECTORY(example)
    285 ADD_SUBDIRECTORY(compare_c)
    286285ADD_SUBDIRECTORY(introduction)
    287286ADD_SUBDIRECTORY(test_more)
  • trunk/bin/check_cmake.sh

    r3934 r3935  
    5454                speed/sacado/CMakeLists.txt | \
    5555                speed/src/CMakeLists.txt | \
    56                 test_more/general/CMakeLists.txt )
     56                test_more/CMakeLists.txt )
    5757                check="CMAKE_BUILD_TYPE"
    5858                if grep -i "$check" $file > /dev/null
     
    6464
    6565                # release build type cases
    66                 compare_c/CMakeLists.txt | \
     66                test_more/compare_c/CMakeLists.txt | \
    6767                cppad_ipopt/CMakeLists.txt | \
    6868                speed/CMakeLists.txt )
     
    7878                example/CMakeLists.txt | \
    7979                introduction/CMakeLists.txt | \
    80                 test_more/CMakeLists.txt )
     80                test_more/general/CMakeLists.txt )
    8181                check="CMAKE_BUILD_TYPE DEBUG"
    8282                if ! grep "$check" $file > /dev/null
  • trunk/bin/check_makefile.sh

    r3931 r3935  
    104104                ;;
    105105
    106                 (compare_c/makefile.am)
     106                (test_more/compare_c/makefile.am)
    107107                if ! grep '^[^#]*-DNDEBUG' $file > /dev/null
    108108                then
  • trunk/configure

    r3934 r3935  
    79447944ipopt_prefix=${IPOPT_DIR}
    79457945
    7946 ac_config_files="$ac_config_files cppad/configure.hpp cppad_ipopt/example/test.sh cppad_ipopt/speed/test.sh cppad_ipopt/test/test.sh example/ipopt_solve/test.sh pkgconfig/cppad.pc pkgconfig/cppad-uninstalled.pc makefile compare_c/makefile cppad_ipopt/src/makefile cppad_ipopt/example/makefile cppad_ipopt/speed/makefile cppad_ipopt/test/makefile example/general/makefile example/atomic/makefile example/deprecated/makefile example/ipopt_solve/makefile example/optimize/makefile example/sparse/makefile example/utility/makefile example/get_started/makefile introduction/makefile example/multi_thread/makefile example/multi_thread/test_multi/makefile example/print_for/makefile speed/adolc/makefile speed/cppad/makefile speed/double/makefile speed/example/makefile speed/fadbad/makefile speed/profile/makefile speed/profile/gprof.sed speed/sacado/makefile speed/src/makefile test_more/general/makefile"
     7946ac_config_files="$ac_config_files cppad/configure.hpp cppad_ipopt/example/test.sh cppad_ipopt/speed/test.sh cppad_ipopt/test/test.sh example/ipopt_solve/test.sh pkgconfig/cppad.pc pkgconfig/cppad-uninstalled.pc makefile cppad_ipopt/src/makefile cppad_ipopt/example/makefile cppad_ipopt/speed/makefile cppad_ipopt/test/makefile example/general/makefile example/atomic/makefile example/deprecated/makefile example/ipopt_solve/makefile example/optimize/makefile example/sparse/makefile example/utility/makefile example/get_started/makefile introduction/makefile example/multi_thread/makefile example/multi_thread/test_multi/makefile example/print_for/makefile speed/adolc/makefile speed/cppad/makefile speed/double/makefile speed/example/makefile speed/fadbad/makefile speed/profile/makefile speed/profile/gprof.sed speed/sacado/makefile speed/src/makefile test_more/compare_c/makefile test_more/general/makefile"
    79477947
    79487948
     
    87828782    "pkgconfig/cppad-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/cppad-uninstalled.pc" ;;
    87838783    "makefile") CONFIG_FILES="$CONFIG_FILES makefile" ;;
    8784     "compare_c/makefile") CONFIG_FILES="$CONFIG_FILES compare_c/makefile" ;;
    87858784    "cppad_ipopt/src/makefile") CONFIG_FILES="$CONFIG_FILES cppad_ipopt/src/makefile" ;;
    87868785    "cppad_ipopt/example/makefile") CONFIG_FILES="$CONFIG_FILES cppad_ipopt/example/makefile" ;;
     
    88088807    "speed/sacado/makefile") CONFIG_FILES="$CONFIG_FILES speed/sacado/makefile" ;;
    88098808    "speed/src/makefile") CONFIG_FILES="$CONFIG_FILES speed/src/makefile" ;;
     8809    "test_more/compare_c/makefile") CONFIG_FILES="$CONFIG_FILES test_more/compare_c/makefile" ;;
    88108810    "test_more/general/makefile") CONFIG_FILES="$CONFIG_FILES test_more/general/makefile" ;;
    88118811    "example_ipopt_solve_test.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS example_ipopt_solve_test.sh" ;;
  • trunk/configure.ac

    r3934 r3935  
    791791
    792792        makefile
    793         compare_c/makefile
    794793        cppad_ipopt/src/makefile
    795794        cppad_ipopt/example/makefile
     
    817816        speed/sacado/makefile
    818817        speed/src/makefile
     818        test_more/compare_c/makefile
    819819        test_more/general/makefile
    820820])
  • trunk/makefile.am

    r3934 r3935  
    344344        example/sparse \
    345345        example/utility \
    346         compare_c \
    347346        introduction \
    348347        example/multi_thread \
    349348        example/multi_thread/test_multi \
     349        test_more/compare_c \
    350350        test_more/general
    351351#
     
    361361        uw_copy_040507.html \
    362362        \
    363         compare_c/CMakeLists.txt \
     363        test_more/compare_c/CMakeLists.txt \
    364364        cppad/CMakeLists.txt \
    365365        pkgconfig/CMakeLists.txt \
     
    403403        example/deprecated \
    404404        example/optimize \
    405         compare_c \
    406405        example/get_started \
    407406        introduction \
     
    409408        example/multi_thread/test_multi \
    410409        example/print_for \
     410        test_more/compare_c \
    411411        test_more/general
    412412
  • trunk/makefile.in

    r3934 r3935  
    196196        speed/profile speed/sacado example/atomic example/deprecated \
    197197        example/general example/get_started example/optimize \
    198         example/print_for example/sparse example/utility compare_c \
    199         introduction example/multi_thread \
    200         example/multi_thread/test_multi test_more/general
     198        example/print_for example/sparse example/utility introduction \
     199        example/multi_thread example/multi_thread/test_multi \
     200        test_more/compare_c test_more/general
    201201am__DIST_COMMON = $(srcdir)/makefile.in \
    202202        $(top_srcdir)/cppad/configure.hpp.in \
     
    744744        example/sparse \
    745745        example/utility \
    746         compare_c \
    747746        introduction \
    748747        example/multi_thread \
    749748        example/multi_thread/test_multi \
     749        test_more/compare_c \
    750750        test_more/general
    751751
     
    762762        uw_copy_040507.html \
    763763        \
    764         compare_c/CMakeLists.txt \
     764        test_more/compare_c/CMakeLists.txt \
    765765        cppad/CMakeLists.txt \
    766766        pkgconfig/CMakeLists.txt \
     
    804804        example/deprecated \
    805805        example/optimize \
    806         compare_c \
    807806        example/get_started \
    808807        introduction \
     
    810809        example/multi_thread/test_multi \
    811810        example/print_for \
     811        test_more/compare_c \
    812812        test_more/general
    813813
  • trunk/omh/appendix.omh

    r3918 r3935  
    2424        omh/appendix/whats_new/whats_new.omh%
    2525        omh/appendix/deprecated/deprecated.omh%
    26         compare_c/CMakeLists.txt%
     26        test_more/compare_c/CMakeLists.txt%
    2727        omh/appendix/numeric_ad.omh%
    2828        omh/appendix/addon.omh%
  • trunk/test_more/CMakeLists.txt

    r3932 r3935  
    1111# Build the test_more directory tests
    1212
    13 # Specifies build type for all the test_more subdirectories:
    14 SET(CMAKE_BUILD_TYPE DEBUG)
    15 
    1613# initialize check_depends
    1714SET(check_test_more_depends "")
     15
     16# compare_c tests
     17ADD_SUBDIRECTORY(compare_c)
    1818
    1919# general tests
  • trunk/test_more/compare_c/CMakeLists.txt

    r3934 r3935  
    1 # $Id$
    21# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
     2# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-17 Bradley M. Bell
    43#
    54# CppAD is distributed under multiple licenses. This distribution is under
     
    2322#
    2423# $head Syntax$$
    25 # $codei%compare_c/det_by_minor_c
     24# $codei%test_more/compare_c/det_by_minor_c
    2625# %$$
    27 # $codei compare_c/det_by_minor_cpp$$
     26# $codei test_more/compare_c/det_by_minor_cpp$$
    2827#
    2928# $head Purpose$$
     
    3231#
    3332# $childtable%
    34 #       compare_c/det_by_minor.c
     33#       test_more/compare_c/det_by_minor.c
    3534# %$$
    3635#
     
    6867ENDFOREACH(com)
    6968
    70 # check_compare_c target
    71 ADD_CUSTOM_TARGET( check_compare_c
     69# check_test_more_compare_c target
     70ADD_CUSTOM_TARGET( check_test_more_compare_c
    7271        DEPENDS check_det_by_minor_c check_det_by_minor_cpp
    7372)
    74 MESSAGE(STATUS "make check_compare_c: available")
     73MESSAGE(STATUS "make check_test_more_compare_c: available")
    7574
    76 # Add check_compare_c to check depends in parent environment
    77 add_to_list(check_depends check_compare_c)
    78 SET(check_depends "${check_depends}" PARENT_SCOPE)
     75# Add check_test_more_compare_c to check depends in parent environment
     76add_to_list(check_test_more_depends check_test_more_compare_c)
     77SET(check_test_more_depends "${check_test_more_depends}" PARENT_SCOPE)
  • trunk/test_more/compare_c/makefile.am

    r3934 r3935  
    1 # $Id$
    21# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
     2# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-17 Bradley M. Bell
    43#
    54# CppAD is distributed under multiple licenses. This distribution is under
  • trunk/test_more/compare_c/makefile.in

    r3934 r3935  
    8989host_triplet = @host@
    9090check_PROGRAMS = det_by_minor_c$(EXEEXT) det_by_minor_cpp$(EXEEXT)
    91 subdir = compare_c
     91subdir = test_more/compare_c
    9292ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    9393am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     
    385385          esac; \
    386386        done; \
    387         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign compare_c/makefile'; \
     387        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test_more/compare_c/makefile'; \
    388388        $(am__cd) $(top_srcdir) && \
    389           $(AUTOMAKE) --foreign compare_c/makefile
     389          $(AUTOMAKE) --foreign test_more/compare_c/makefile
    390390makefile: $(srcdir)/makefile.in $(top_builddir)/config.status
    391391        @case '$?' in \
  • trunk/test_more/general/CMakeLists.txt

    r3933 r3935  
    1010# -----------------------------------------------------------------------------
    1111# Build the test_more/general tests
     12
     13# Specifies build type for test_more/general
     14SET(CMAKE_BUILD_TYPE DEBUG)
    1215
    1316# adolc_sources, adolc_libs
Note: See TracChangeset for help on using the changeset viewer.