On Thu, Jul 11, 2013 at 04:40:45PM -0000, brane_at_apache.org wrote:
> Author: brane
> Date: Thu Jul 11 16:40:45 2013
> New Revision: 1502282
>
> URL: http://svn.apache.org/r1502282
> Log:
> Reintegrate the gtest_addition branch to trunk and convert the result to
> use Googlemock and begin writing a Googlemock/Googletest-based test suite
> for C++HL.
>
> * .: Ignore gmock-fused instead of gtest.
> * INSTALL: Note optional dependency on Googlemock.
> * get-deps.sh: Rename all getst to gmock and implement Googlemock downloader.
>
> * build.conf (cxxhl-tests): Depend on libgmock and make conditional.
> (libgmock): New target.
> * configure.ac: Check for Googlemock.
> (GMOCK_SRCDIR, SVN_USE_GMOCK): New substituted variables.
>
> * Makefile.in (SVN_USE_GMOCK, GMOCK_INCLUDES, CNOWARNFLAGS, CXXNOWARNFLAGS):
> Expand configure variables.
> (COMPILE_NOWARN, COMPILE_CXX_NOWARN, LT_COMPILE_CXX_NOWARN):
> New generic compilation rules.
> (COMPILE_CXXHL_CXX): Rewrite in terms of LT_COMPILE_CXX.
> (COMPILE_GMOCK_CXX, COMPILE_CXXHL_GMOCK_CXX): New rules.
>
> * gen-make.py: Add placeholder for --disable-gmock option.
> * build/generator/gen_base.py (TargetLinked): Make .cc a source file extension.
> * doc/programmer/gtest-guide.txt: New.
>
> +++ subversion/trunk/configure.ac Thu Jul 11 16:40:45 2013
> @@ -628,6 +628,28 @@ fi
> AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
> AC_SUBST(SVN_GNOME_KEYRING_LIBS)
>
> +dnl Googlemock -----------------
> +AC_ARG_ENABLE([gmock],
> + AS_HELP_STRING([--disable-gmock],
> + [Do not use the Googlemock testing framework]),
> + [enable_gmock=yes],
> + [enable_gmock="$withval"])
Does this work? Our other uses of AC_ARG_ENABLE use $enableval (not $withval)
and use it in the 3rd argument (not the 4th).
Also, I just noticed the warnings bot --- which does just 'make all clean
distclean' --- now has a 'gmock-fused' dir created in the root of the working
copy. (It an in-tree build.) That bot doesn't use get-deps.sh. Why does itt
dir get created? Given that that bot doesn't have gmock installed, shouldn't
the build system refrain from creating that directory?
Shouldn't 'make extraclean' remove that directory? It doesn't seem to.
Received on 2013-07-11 22:37:40 CEST