eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Googletest export

Browse Source 
Internal Change

PiperOrigin-RevId: 234823465
This commit is contained in:
misterg 2019-02-20 13:32:08 -05:00 committed by Gennadiy Civil
parent 0e424c7594
commit 873e479817
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/Makefile.am
View File

@ -133,7 +133,6 @@ EXTRA_DIST += \
make/Makefile make/Makefile
# Pump scripts for generating Google Mock headers. # Pump scripts for generating Google Mock headers.
# TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump.
EXTRA_DIST += \ EXTRA_DIST += \
include/gmock/gmock-generated-actions.h.pump \ include/gmock/gmock-generated-actions.h.pump \
include/gmock/gmock-generated-function-mockers.h.pump \ include/gmock/gmock-generated-function-mockers.h.pump \
@ -188,7 +187,6 @@ if HAVE_PYTHON
# generated. # generated.
$(test_gmock_fused_test_SOURCES): fused-gmock-internal $(test_gmock_fused_test_SOURCES): fused-gmock-internal
# TODO(vladl@google.com): Find a way to add Google Tests's sources here.
fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \ fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
$(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \ $(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \
$(lib_libgmock_main_la_SOURCES) \ $(lib_libgmock_main_la_SOURCES) \

15
googlemock/configure.ac
View File

@ -24,19 +24,12 @@ AC_PROG_CXX
AC_LANG([C++]) AC_LANG([C++])
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
# TODO(chandlerc@google.com): Currently we aren't running the Python tests
# against the interpreter detected by AM_PATH_PYTHON, and so we condition
# HAVE_PYTHON by requiring "python" to be in the PATH, and that interpreter's
# version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env"
# hashbang.
PYTHON= # We *do not* allow the user to specify a python interpreter PYTHON= # We *do not* allow the user to specify a python interpreter
AC_PATH_PROG([PYTHON],[python],[:]) AC_PATH_PROG([PYTHON],[python],[:])
AS_IF([test "$PYTHON" != ":"], AS_IF([test "$PYTHON" != ":"],
[AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])]) [AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])])
AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"]) AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"])
# TODO(chandlerc@google.com) Check for the necessary system headers.
# Configure pthreads. # Configure pthreads.
AC_ARG_WITH([pthreads], AC_ARG_WITH([pthreads],
[AS_HELP_STRING([--with-pthreads], [AS_HELP_STRING([--with-pthreads],
@ -83,10 +76,7 @@ dependency upon GoogleTest to build, please provide a version, or allow
GoogleMock to use any installed version and fall back upon its internal GoogleMock to use any installed version and fall back upon its internal
version.])]) version.])])
# Setup various GTEST variables. TODO(chandlerc@google.com): When these are # Setup various GTEST variables.
# used below, they should be used such that any pre-existing values always
# trump values we set them to, so that they can be used to selectively override
# details of the detection process.
AC_ARG_VAR([GTEST_CONFIG], AC_ARG_VAR([GTEST_CONFIG],
[The exact path of Google Test's 'gtest-config' script.]) [The exact path of Google Test's 'gtest-config' script.])
AC_ARG_VAR([GTEST_CPPFLAGS], AC_ARG_VAR([GTEST_CPPFLAGS],
@ -139,8 +129,5 @@ AS_IF([test "x${HAVE_BUILT_GTEST}" = "xyes"],
GTEST_LIBS='$(top_builddir)/../googletest/lib/libgtest.la' GTEST_LIBS='$(top_builddir)/../googletest/lib/libgtest.la'
GTEST_VERSION="${GTEST_MIN_VERSION}"]) GTEST_VERSION="${GTEST_MIN_VERSION}"])
# TODO(chandlerc@google.com) Check the types, structures, and other compiler
# and architecture characteristics.
# Output the generated files. No further autoconf macros may be used. # Output the generated files. No further autoconf macros may be used.
AC_OUTPUT AC_OUTPUT