You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2018/12/18 17:58:31 UTC
svn commit: r1849200 - in /subversion/trunk: INSTALL Makefile.in build.conf
configure.ac doc/programmer/gtest-guide.txt gen-make.py get-deps.sh
Author: brane
Date: Tue Dec 18 17:58:31 2018
New Revision: 1849200
URL: http://svn.apache.org/viewvc?rev=1849200&view=rev
Log:
Remove optional dependency on Googletest and Googlemock.
* INSTALL: don't mention googlemock.
* Makefile.in
(SVN_USE_GOOGLEMOCK, GOOGLEMOCK_INCLUDES, GOOGLEMOCK_LIB_INCLUDES,
COMPILE_GOOGLEMOCK_CXX, COMPILE_CXXHL_GOOGLEMOCK_CXX): Removed.
* build.conf
(cxxhl-tests): Temporarily disabled due to dependencies.
(libgooglemock): Removed.
* configure.ac: Remove references to Googlemock.
* gen-make.py: Likewise.
* get-deps.sh: Likewise.
* doc/programmer/gtest-guide.txt: Removed.
Removed:
subversion/trunk/doc/programmer/gtest-guide.txt
Modified:
subversion/trunk/INSTALL
subversion/trunk/Makefile.in
subversion/trunk/build.conf
subversion/trunk/configure.ac
subversion/trunk/gen-make.py
subversion/trunk/get-deps.sh
Modified: subversion/trunk/INSTALL
URL: http://svn.apache.org/viewvc/subversion/trunk/INSTALL?rev=1849200&r1=1849199&r2=1849200&view=diff
==============================================================================
--- subversion/trunk/INSTALL (original)
+++ subversion/trunk/INSTALL Tue Dec 18 17:58:31 2018
@@ -161,11 +161,6 @@ I. INTRODUCTION
configured via auto-props or the mime-types-file option
take precedence.
- * Googlemock aka Gmock (OPTIONAL)
-
- This optional package is used by the tests for Subversions'
- C++ bindings.
-
C. Dependencies in Detail
@@ -525,12 +520,6 @@ I. INTRODUCTION
--with-libmagic
- 21. Googlemock (OPTIONAL)
-
- Googlemock can be installed and built in-tree by invoking
-
- $ ./get-dep.sh gmock
-
22. LZ4 (OPTIONAL)
Subversion uses LZ4 compression libary version r129 or above. Configure
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1849200&r1=1849199&r2=1849200&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Tue Dec 18 17:58:31 2018
@@ -141,10 +141,6 @@ APACHE_INCLUDES = @APACHE_INCLUDES@
APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
APACHE_LDFLAGS = @APACHE_LDFLAGS@
-SVN_USE_GOOGLEMOCK = @SVN_USE_GOOGLEMOCK@
-GOOGLEMOCK_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock/include -I@GOOGLEMOCK_SRCDIR@/googletest/include
-GOOGLEMOCK_LIB_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock -I@GOOGLEMOCK_SRCDIR@/googletest $(GOOGLEMOCK_INCLUDES)
-
SWIG = @SWIG@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
@@ -262,8 +258,6 @@ TEST_SHLIB_VAR_SWIG_RB=\
# special compilation for files destined for cxxhl
COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) -o $@ -c
-COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) -o $@ -c
-COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GOOGLEMOCK_INCLUDES) -o $@ -c
LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
LINK_LIB = $(LINK) $(LT_SO_VERSION)
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1849200&r1=1849199&r2=1849200&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Dec 18 17:58:31 2018
@@ -739,33 +739,16 @@ msvc-static = yes
compile-cmd = $(COMPILE_CXXHL_CXX)
link-cmd = $(LINK_CXX_LIB)
-[cxxhl-tests]
-description = Unit tests for Subversion C++ HighLevel bindings
-when = SVN_USE_GOOGLEMOCK
-type = exe
-path = subversion/bindings/cxxhl
-libs = libsvncxxhl libgooglemock libsvn_subr apr
-sources = tests/*.cpp
-install = cxxhl-tests
-compile-cmd = $(COMPILE_CXXHL_GOOGLEMOCK_CXX)
-link-cmd = $(LINK_CXX)
-
-
-# ----------------------------------------------------------------------------
-#
-# Googlemock targets
-#
-
-[libgooglemock]
-description = Googlemock Library
-when = SVN_USE_GOOGLEMOCK
-type = lib
-path = googlemock
-sources = googletest/src/gtest-all.cc googlemock/src/gmock-all.cc
-install = cxxhl-tests
-msvc-static = yes
-compile-cmd = $(COMPILE_GOOGLEMOCK_CXX)
-link-cmd = $(LINK_CXX_LIB)
+##![cxxhl-tests]
+##!description = Unit tests for Subversion C++ HighLevel bindings
+##!when = SVN_USE_GOOGLEMOCK
+##!type = exe
+##!path = subversion/bindings/cxxhl
+##!libs = libsvncxxhl libgooglemock libsvn_subr apr
+##!sources = tests/*.cpp
+##!install = cxxhl-tests
+##!compile-cmd = $(COMPILE_CXXHL_GOOGLEMOCK_CXX)
+##!link-cmd = $(LINK_CXX)
# ----------------------------------------------------------------------------
#
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1849200&r1=1849199&r2=1849200&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Tue Dec 18 17:58:31 2018
@@ -640,29 +640,6 @@ AC_SUBST(SVN_GNOME_KEYRING_LIBS)
dnl LibSecret -------------------
SVN_LIB_SECRET
-dnl Googlemock -----------------
-AC_ARG_ENABLE([googlemock],
- AS_HELP_STRING([--disable-googlemock],
- [Do not use the Googlemock testing framework]),
- [],
- [enable_googlemock=yes])
-
-AC_SUBST([GOOGLEMOCK_SRCDIR], [$abs_srcdir/googlemock])
-AC_MSG_CHECKING([whether use Googlemock])
-if test "$enable_googlemock" != "no"; then
- if test -d "$GOOGLEMOCK_SRCDIR"; then
- AC_MSG_RESULT([yes])
- SVN_USE_GOOGLEMOCK=true
- else
- AC_MSG_RESULT([no])
- SVN_USE_GOOGLEMOCK=false
- fi
-else
- AC_MSG_RESULT([no])
- SVN_USE_GOOGLEMOCK=false
-fi
-AC_SUBST([SVN_USE_GOOGLEMOCK])
-
dnl Ev2 experimental features ----------------------
dnl Note: The Ev2 implementations will be built unconditionally, but by
dnl providing this flag, users can choose to use the currently-shimmed Ev2
Modified: subversion/trunk/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/gen-make.py?rev=1849200&r1=1849199&r2=1849200&view=diff
==============================================================================
--- subversion/trunk/gen-make.py (original)
+++ subversion/trunk/gen-make.py Tue Dec 18 17:58:31 2018
@@ -214,8 +214,6 @@ def _usage_exit(err=None):
print("")
print(" --with-apr_memcache=DIR")
print(" the apr_memcache sources are in DIR")
- print(" --disable-gmock")
- print(" do not use Googlemock")
sys.exit(1)
@@ -263,7 +261,6 @@ if __name__ == '__main__':
'disable-shared',
'installed-libs=',
'vsnet-version=',
- 'disable-gmock',
])
if len(args) > 1:
_usage_exit("Too many arguments")
Modified: subversion/trunk/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1849200&r1=1849199&r2=1849200&view=diff
==============================================================================
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Tue Dec 18 17:58:31 2018
@@ -38,8 +38,6 @@ ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
SQLITE_VERSION=${SQLITE_VERSION:-"3.8.11.1"}
# Used to construct the SQLite download URL.
SQLITE_VERSION_REL_YEAR=2015
-GTEST_VERSION=${GMOCK_VERSION:-"1.7.0"}
-GMOCK_VERSION=${GMOCK_VERSION:-"1.7.0"}
HTTPD_VERSION=${HTTPD_VERSION:-"2.4.10"}
APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
@@ -49,10 +47,6 @@ SERF=serf-${SERF_VERSION}
ZLIB=zlib-${ZLIB_VERSION}
SQLITE_VERSION_LIST=`echo $SQLITE_VERSION | sed -e 's/\./ /g'`
SQLITE=sqlite-amalgamation-`printf %d%02d%02d%02d $SQLITE_VERSION_LIST`
-GTEST=release-${GTEST_VERSION}
-GTEST_URL=https://github.com/google/googletest/archive
-GMOCK=release-${GMOCK_VERSION}
-GMOCK_URL=https://github.com/google/googlemock/archive
HTTPD=httpd-${HTTPD_VERSION}
APR_ICONV=apr-iconv-${APR_ICONV_VERSION}
@@ -72,7 +66,7 @@ APACHE_MIRROR=http://archive.apache.org/
# helpers
usage() {
echo "Usage: $0"
- echo "Usage: $0 [ apr | serf | zlib | sqlite | googlemock ] ..."
+ echo "Usage: $0 [ apr | serf | zlib | sqlite ] ..."
exit $1
}
@@ -127,29 +121,11 @@ get_sqlite() {
}
-get_googlemock() {
- test -d $BASEDIR/googlemock && return
-
- cd $TEMPDIR
- $HTTP_FETCH ${GTEST_URL}/${GTEST}.zip
- unzip -q ${GTEST}.zip
- rm -f ${GTEST}.zip
-
- $HTTP_FETCH ${GMOCK_URL}/${GMOCK}.zip
- unzip -q ${GMOCK}.zip
- rm -f ${GMOCK}.zip
-
- cd $BASEDIR
- mkdir googlemock
- mv $TEMPDIR/googletest-release-${GTEST_VERSION} googlemock/googletest
- mv $TEMPDIR/googlemock-release-${GMOCK_VERSION} googlemock/googlemock
-}
-
# main()
get_deps() {
mkdir -p $TEMPDIR
- for i in zlib serf sqlite-amalgamation apr apr-util gmock-fused; do
+ for i in zlib serf sqlite-amalgamation apr apr-util; do
if [ -d $i ]; then
echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
fi