/[Apache-SVN]
ViewVC logotype

Revision 1502282


Jump to revision: Previous Next
Author: brane
Date: Thu Jul 11 16:40:45 2013 UTC (11 years, 4 months ago)
Changed paths: 13
Log Message:
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/bindings/cxxhl/tests/cxxhl-tests.cpp,
  subversion/bindings/cxxhl/tests/test_aprwrap.cpp: New test suite files.
* subversion/bindings/cxxhl/tests/test_exception.cpp: Temporarily disable.

* tools/dist/make-deps-tarball.sh:
   Mergeinfo was updated as a side effect of the merge.


Changed paths

Path Details
Directorysubversion/trunk/ modified , props changed
Directorysubversion/trunk/INSTALL modified , text changed
Directorysubversion/trunk/Makefile.in modified , text changed
Directorysubversion/trunk/build/generator/gen_base.py modified , text changed
Directorysubversion/trunk/build.conf modified , text changed
Directorysubversion/trunk/configure.ac modified , text changed
Directorysubversion/trunk/doc/programmer/gtest-guide.txt
(Copied from subversion/branches/gtest_addition/doc/programmer/gtest-guide.txt, r1502138)
added , text changed , props changed
Directorysubversion/trunk/gen-make.py modified , text changed
Directorysubversion/trunk/get-deps.sh modified , text changed
Directorysubversion/trunk/subversion/bindings/cxxhl/tests/cxxhl-tests.cpp added
Directorysubversion/trunk/subversion/bindings/cxxhl/tests/test_aprwrap.cpp added
Directorysubversion/trunk/subversion/bindings/cxxhl/tests/test_exception.cpp modified , text changed
Directorysubversion/trunk/tools/dist/make-deps-tarball.sh modified , props changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26