Changeset 3935 for trunk/test_more


Ignore:
Timestamp:
May 19, 2017 9:56:56 PM (3 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/test_more
Files:
1 added
2 edited
4 copied

Legend:

Unmodified
Added
Removed
  • 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.