mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r1131792 [1/13] - in /incubator/mesos/trunk: ./ src/ src/third_party/gtest-1.4.0-patched/ src/third_party/gtest-1.4.0-patched/build-aux/ src/third_party/gtest-1.4.0-patched/codegear/ src/third_party/gtest-1.4.0-patched/include/gtest/ src/th...
Date Sun, 05 Jun 2011 05:32:26 GMT
Author: benh
Date: Sun Jun  5 05:32:17 2011
New Revision: 1131792

URL: http://svn.apache.org/viewvc?rev=1131792&view=rev
Log:
Upgraded Google Test to version 1.5.0.

Added:
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/CHANGES
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CHANGES
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/CMakeLists.txt
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/CONTRIBUTORS
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CONTRIBUTORS
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/COPYING
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/COPYING
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/Makefile.am
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/Makefile.in
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/README
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/aclocal.m4
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/aclocal.m4
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/config.guess
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/config.guess
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/config.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/config.h.in
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/config.h.in
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/config.h.in
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/config.sub
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/config.sub
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/depcomp
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/depcomp
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/install-sh
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/install-sh
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/ltmain.sh
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/ltmain.sh
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/missing
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/missing
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/build-aux/stamp-h1
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/codegear/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/codegear/gtest.cbproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest.cbproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/codegear/gtest.groupproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest.groupproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/codegear/gtest_all.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest_all.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/codegear/gtest_link.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest_link.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/codegear/gtest_main.cbproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest_main.cbproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/codegear/gtest_unittest.cbproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest_unittest.cbproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/configure.ac
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure.ac
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/fused-src/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/fused-src/gtest/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/fused-src/gtest/gtest-all.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/fused-src/gtest/gtest.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/fused-src/gtest/gtest_main.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest_main.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest-death-test.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-death-test.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest-message.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-message.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest-param-test.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-param-test.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest-param-test.h.pump
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-param-test.h.pump
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest-spi.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-spi.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest-test-part.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-test-part.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest-typed-test.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-typed-test.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest_pred_impl.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest_pred_impl.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/gtest_prod.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest_prod.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-death-test-internal.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-death-test-internal.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-filepath.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-filepath.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-internal.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-internal.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-linked_ptr.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-linked_ptr.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-param-util-generated.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-param-util-generated.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-param-util-generated.h.pump
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-param-util-generated.h.pump
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-param-util.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-param-util.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-port.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-port.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-string.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-string.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-tuple.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-tuple.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-tuple.h.pump
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-tuple.h.pump
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-type-util.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-type-util.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/include/gtest/internal/gtest-type-util.h.pump
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-type-util.h.pump
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/m4/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/m4/acx_pthread.m4
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/m4/acx_pthread.m4
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/m4/gtest.m4
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/m4/gtest.m4
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest-md.sln
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest-md.sln
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest-md.vcproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest-md.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest.sln
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest.sln
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest.vcproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest_main-md.vcproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_main-md.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest_main.vcproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_main.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest_prod_test-md.vcproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_prod_test-md.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest_prod_test.vcproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_prod_test.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest_unittest-md.vcproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_unittest-md.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/msvc/gtest_unittest.vcproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_unittest.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/prime_tables.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/prime_tables.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample1.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample1.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample1.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample1.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample10_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample10_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample1_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample1_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample2.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample2.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample2.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample2.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample2_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample2_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample3-inl.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample3-inl.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample3_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample3_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample4.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample4.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample4.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample4.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample4_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample4_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample5_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample5_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample6_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample6_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample7_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample7_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample8_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample8_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/samples/sample9_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample9_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/scripts/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/scripts/fuse_gtest_files.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scripts/fuse_gtest_files.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/scripts/gen_gtest_pred_impl.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scripts/gen_gtest_pred_impl.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/scripts/gtest-config.in
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scripts/gtest-config.in
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/scripts/pump.py   (with props)
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/gtest-all.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-all.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/gtest-death-test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-death-test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/gtest-filepath.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-filepath.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/gtest-internal-inl.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-internal-inl.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/gtest-port.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-port.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/gtest-test-part.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-test-part.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/gtest-typed-test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-typed-test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/gtest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/src/gtest_main.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest_main.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-death-test_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-death-test_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-filepath_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-filepath_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-linked_ptr_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-linked_ptr_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-listener_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-listener_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-message_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-message_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-options_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-options_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-param-test2_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-param-test2_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-param-test_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-param-test_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-param-test_test.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-param-test_test.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-port_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-port_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-test-part_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-test-part_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-tuple_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-tuple_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-typed-test2_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-typed-test2_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-typed-test_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-typed-test_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-typed-test_test.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-typed-test_test.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest-unittest-api_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-unittest-api_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_all_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_all_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_break_on_failure_unittest.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_break_on_failure_unittest.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_break_on_failure_unittest_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_break_on_failure_unittest_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_color_test.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_color_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_color_test_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_color_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_env_var_test.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_env_var_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_env_var_test_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_env_var_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_environment_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_environment_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_filter_unittest.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_filter_unittest.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_filter_unittest_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_filter_unittest_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_help_test.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_help_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_help_test_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_help_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_list_tests_unittest.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_list_tests_unittest.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_list_tests_unittest_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_list_tests_unittest_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_main_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_main_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_no_test_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_no_test_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_output_test.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_output_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_output_test_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_output_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_output_test_golden_lin.txt
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_output_test_golden_lin.txt
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_output_test_golden_win.txt
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_output_test_golden_win.txt
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_pred_impl_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_pred_impl_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_prod_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_prod_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_repeat_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_repeat_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_shuffle_test.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_shuffle_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_shuffle_test_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_shuffle_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_sole_header_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_sole_header_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_stress_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_test_utils.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_test_utils.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_throw_on_failure_ex_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_throw_on_failure_ex_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_throw_on_failure_test.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_throw_on_failure_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_throw_on_failure_test_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_throw_on_failure_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_uninitialized_test.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_uninitialized_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_uninitialized_test_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_uninitialized_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_unittest.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_xml_outfile1_test_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_outfile1_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_xml_outfile2_test_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_outfile2_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_xml_outfiles_test.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_outfiles_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_xml_output_unittest.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_output_unittest.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_xml_output_unittest_.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_output_unittest_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/gtest_xml_test_utils.py
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_test_utils.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/production.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/production.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/production.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/production.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/run_tests_util.py   (with props)
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/test/run_tests_util_test.py   (with props)
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Config/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Config/DebugProject.xcconfig
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/DebugProject.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Config/FrameworkTarget.xcconfig
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/FrameworkTarget.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Config/General.xcconfig
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/General.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Config/ReleaseProject.xcconfig
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/ReleaseProject.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Config/StaticLibraryTarget.xcconfig
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/StaticLibraryTarget.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Config/TestTarget.xcconfig
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/TestTarget.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Resources/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Resources/Info.plist
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Resources/Info.plist
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Samples/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Samples/FrameworkSample/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Samples/FrameworkSample/Info.plist
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/Info.plist
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Samples/FrameworkSample/runtests.sh
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scons/SConstruct
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Samples/FrameworkSample/widget.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/widget.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Samples/FrameworkSample/widget.h
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/widget.h
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Samples/FrameworkSample/widget_test.cc
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/widget_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Scripts/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Scripts/runtests.sh   (contents, props changed)
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_uninitialized_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/Scripts/versiongenerate.py   (with props)
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/gtest.xcodeproj/
    incubator/mesos/trunk/src/third_party/gtest-1.5.0/xcode/gtest.xcodeproj/project.pbxproj
      - copied, changed from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/gtest.xcodeproj/project.pbxproj
Removed:
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CHANGES
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CONTRIBUTORS
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/COPYING
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/Makefile.am
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/Makefile.in
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/PATCH-INFO
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/README
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/aclocal.m4
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/config.guess
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/config.h.in
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/config.sub
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/depcomp
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/install-sh
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/ltmain.sh
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/build-aux/missing
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest.cbproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest.groupproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest_all.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest_link.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest_main.cbproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/codegear/gtest_unittest.cbproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/configure.ac
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-death-test.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-message.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-param-test.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-param-test.h.pump
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-spi.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-test-part.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest-typed-test.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest_pred_impl.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/gtest_prod.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-death-test-internal.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-filepath.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-internal.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-linked_ptr.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-param-util-generated.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-param-util-generated.h.pump
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-param-util.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-port.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-port.h.orig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-string.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-tuple.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-tuple.h.pump
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-type-util.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/include/gtest/internal/gtest-type-util.h.pump
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/issue129067_13024.diff
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/m4/acx_pthread.m4
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/m4/gtest.m4
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest-md.sln
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest-md.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest.sln
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_main-md.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_main.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_prod_test-md.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_prod_test.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_unittest-md.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/msvc/gtest_unittest.vcproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/prime_tables.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample1.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample1.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample10_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample1_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample2.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample2.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample2_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample3-inl.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample3_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample4.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample4.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample4_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample5_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample6_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample7_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample8_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/samples/sample9_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scons/SConscript
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scons/SConstruct
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scons/SConstruct.common
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scripts/fuse_gtest_files.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scripts/gen_gtest_pred_impl.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/scripts/gtest-config.in
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-all.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-death-test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-filepath.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-internal-inl.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-port.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-test-part.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest-typed-test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/src/gtest_main.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-death-test_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-filepath_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-linked_ptr_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-listener_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-message_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-options_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-param-test2_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-param-test_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-param-test_test.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-port_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-port_test.cc.orig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-test-part_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-tuple_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-typed-test2_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-typed-test_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-typed-test_test.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest-unittest-api_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_all_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_break_on_failure_unittest.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_break_on_failure_unittest_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_color_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_color_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_env_var_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_env_var_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_environment_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_filter_unittest.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_filter_unittest_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_help_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_help_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_list_tests_unittest.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_list_tests_unittest_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_main_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_nc.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_nc_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_no_test_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_output_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_output_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_output_test_golden_lin.txt
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_output_test_golden_win.txt
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_pred_impl_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_prod_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_repeat_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_shuffle_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_shuffle_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_sole_header_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_stress_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_stress_test.cc.orig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_test_utils.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_throw_on_failure_ex_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_throw_on_failure_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_throw_on_failure_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_uninitialized_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_uninitialized_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_unittest.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_unittest.cc.orig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_outfile1_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_outfile2_test_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_outfiles_test.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_output_unittest.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_output_unittest_.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/gtest_xml_test_utils.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/production.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/test/production.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/DebugProject.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/FrameworkTarget.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/General.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/ReleaseProject.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/StaticLibraryTarget.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Config/TestTarget.xcconfig
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Resources/Info.plist
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/Info.plist
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/widget.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/widget.h
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Samples/FrameworkSample/widget_test.cc
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Scripts/runtests.sh
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/Scripts/versiongenerate.py
    incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/xcode/gtest.xcodeproj/project.pbxproj
Modified:
    incubator/mesos/trunk/configure
    incubator/mesos/trunk/configure.ac
    incubator/mesos/trunk/src/Makefile.in

Modified: incubator/mesos/trunk/configure
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure?rev=1131792&r1=1131791&r2=1131792&view=diff
==============================================================================
--- incubator/mesos/trunk/configure (original)
+++ incubator/mesos/trunk/configure Sun Jun  5 05:32:17 2011
@@ -566,6 +566,7 @@ CPPFLAGS
 LDFLAGS
 CXXFLAGS
 CXX
+LOCAL_ZOOKEEPER
 SWIG
 WEBUI_FLAGS
 WITH_WEBUI
@@ -632,6 +633,7 @@ with_python_headers
 with_ruby_headers
 with_webui
 with_swig
+with_local_zookeeper
 '
       ac_precious_vars='build_alias
 host_alias
@@ -645,8 +647,9 @@ CCC
 CC
 CFLAGS'
 ac_subdirs_all='src/third_party/libprocess
-src/third_party/gtest-1.4.0-patched
-src/third_party/glog-0.3.0'
+src/third_party/gtest-1.5.0
+src/third_party/glog-0.3.0
+src/third_party/zookeeper-3.3.1/src/c'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -1264,6 +1267,7 @@ Optional Packages:
   --with-ruby-headers=DIR find Ruby headers in DIR
   --with-webui            enable web UI (requires Python)
   --with-swig=PATH        use the SWIG binary at PATH
+  --with-local-zookeeper  Use local ZooKeeper for building
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -1783,11 +1787,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-CFLAGS="${CFLAGS} -O2 -fno-strict-aliasing -fPIC"
-CXXFLAGS="${CXXFLAGS} -O2 -fno-strict-aliasing -fPIC"
+# Use explicit python version 2.6.
+PYTHON=python2.6
+
+# Update CFLAGS and CXXFLAGS with environment args.
+CFLAGS="-O2 -fno-strict-aliasing -fPIC ${CFLAGS}"
+CXXFLAGS="-O2 -fno-strict-aliasing -fPIC ${CXXFLAGS}"
+
 export CFLAGS
 export CXXFLAGS
-PYTHON=python
+
+# Update CFLAGS and CXXFLAGS in configure args.
+# TODO(benh): Don't send args just for us (e.g., --with-webui).
+ac_configure_args=`echo $ac_configure_args | \
+                   sed -e "s/CFLAGS=/CFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
+ac_configure_args=`echo $ac_configure_args | \
+                   sed -e "s/CXXFLAGS=/CXXFLAGS=-O2 -fno-strict-aliasing -fPIC /"`
 ac_configure_args="$ac_configure_args --enable-shared=no"
 
 ac_config_files="$ac_config_files Makefile src/Makefile src/config.hpp"
@@ -1819,10 +1834,12 @@ ac_configure="$SHELL $ac_aux_dir/configu
 
 subdirs="$subdirs src/third_party/libprocess"
 
-subdirs="$subdirs src/third_party/gtest-1.4.0-patched"
+subdirs="$subdirs src/third_party/gtest-1.5.0"
 
 subdirs="$subdirs src/third_party/glog-0.3.0"
 
+subdirs="$subdirs src/third_party/zookeeper-3.3.1/src/c"
+
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2050,6 +2067,20 @@ fi
 
 
 
+LOCAL_ZOOKEEPER="no"
+
+# Check whether --with-local-zookeeper was given.
+if test "${with_local_zookeeper+set}" = set; then :
+  withval=$with_local_zookeeper; case "$with_local_zookeeper" in
+		    yes) LOCAL_ZOOKEEPER="yes" ;;
+                    no) LOCAL_ZOOKEEPER="no" ;;
+		    *) as_fn_error "
+*** --with-local-zookeeper does not take arguments" "$LINENO" 5 ;;
+	          esac
+fi
+
+
+
 # Checks for programs.
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'

Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1131792&r1=1131791&r2=1131792&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Sun Jun  5 05:32:17 2011
@@ -13,7 +13,7 @@ ac_configure_args="$ac_configure_args --
 
 AC_CONFIG_FILES([Makefile src/Makefile src/config.hpp])
 AC_CONFIG_SUBDIRS([src/third_party/libprocess])
-AC_CONFIG_SUBDIRS([src/third_party/gtest-1.4.0-patched])
+AC_CONFIG_SUBDIRS([src/third_party/gtest-1.5.0])
 AC_CONFIG_SUBDIRS([src/third_party/glog-0.3.0])
 
 AC_CANONICAL_SYSTEM

Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1131792&r1=1131791&r2=1131792&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun  5 05:32:17 2011
@@ -25,7 +25,7 @@ LOCAL_ZOOKEEPER = @LOCAL_ZOOKEEPER@
 LIBEV = third_party/libprocess/third_party/libev-3.8
 
 GLOG = third_party/glog-0.3.0
-GTEST = third_party/gtest-1.4.0-patched
+GTEST = third_party/gtest-1.5.0
 
 ZOOKEEPER = third_party/zookeeper-3.3.1/src/c
 

Copied: incubator/mesos/trunk/src/third_party/gtest-1.5.0/CHANGES (from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CHANGES)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/gtest-1.5.0/CHANGES?p2=incubator/mesos/trunk/src/third_party/gtest-1.5.0/CHANGES&p1=incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CHANGES&r1=1131791&r2=1131792&rev=1131792&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CHANGES (original)
+++ incubator/mesos/trunk/src/third_party/gtest-1.5.0/CHANGES Sun Jun  5 05:32:17 2011
@@ -1,3 +1,25 @@
+Changes for 1.5.0:
+
+ * New feature: assertions can be safely called in multiple threads
+   where the pthreads library is available.
+ * New feature: predicates used inside EXPECT_TRUE() and friends
+   can now generate custom failure messages.
+ * New feature: Google Test can now be compiled as a DLL.
+ * New feature: fused source files are included.
+ * New feature: prints help when encountering unrecognized Google Test flags.
+ * Experimental feature: CMake build script (requires CMake 2.6.4+).
+ * Experimental feature: the Pump script for meta programming.
+ * double values streamed to an assertion are printed with enough precision
+   to differentiate any two different values.
+ * Google Test now works on Solaris and AIX.
+ * Build and test script improvements.
+ * Bug fixes and implementation clean-ups.
+
+ Potentially breaking changes:
+
+ * Stopped supporting VC++ 7.1 with exceptions disabled.
+ * Dropped support for 'make install'.
+
 Changes for 1.4.0:
 
  * New feature: the event listener API

Added: incubator/mesos/trunk/src/third_party/gtest-1.5.0/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/gtest-1.5.0/CMakeLists.txt?rev=1131792&view=auto
==============================================================================
--- incubator/mesos/trunk/src/third_party/gtest-1.5.0/CMakeLists.txt (added)
+++ incubator/mesos/trunk/src/third_party/gtest-1.5.0/CMakeLists.txt Sun Jun  5 05:32:17 2011
@@ -0,0 +1,384 @@
+########################################################################
+# Experimental CMake build script for Google Test.
+#
+# Consider this a prototype.  It will change drastically.  For now,
+# this is only for people on the cutting edge.
+#
+# To run the tests for Google Test itself on Linux, use 'make test' or
+# ctest.  You can select which tests to run using 'ctest -R regex'.
+# For more options, run 'ctest --help'.
+
+# For hermetic builds, we may need to tell CMake to use compiler in a
+# specific location.
+if (gtest_compiler)
+  include(CMakeForceCompiler)
+  cmake_force_c_compiler("${gtest_compiler}" "")
+  cmake_force_cxx_compiler("${gtest_compiler}" "")
+endif()
+
+########################################################################
+#
+# Project-wide settings
+
+# Name of the project.
+#
+# CMake files in this project can refer to the root source directory
+# as ${gtest_SOURCE_DIR} and to the root binary directory as
+# ${gtest_BINARY_DIR}.
+# Language "C" is required for find_package(Threads).
+project(gtest CXX C)
+cmake_minimum_required(VERSION 2.6.4)
+
+if (MSVC)
+  # For MSVC, CMake sets certain flags to defaults we want to override.
+  # This replacement code is taken from sample in the CMake Wiki at
+  # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace.
+  foreach (flag_var
+           CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+           CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+    # In hermetic build environments, tests may not have access to MS runtime
+    # DLLs, so this replaces /MD (CRT libraries in DLLs) with /MT (static CRT
+    # libraries).
+    string(REPLACE "/MD" "-MT" ${flag_var} "${${flag_var}}")
+    # We prefer more strict warning checking for building Google Test.
+    # Replaces /W3 with /W4 in defaults.
+    string(REPLACE "/W3" "-W4" ${flag_var} "${${flag_var}}")
+  endforeach()
+endif()
+
+# Where gtest's .h files can be found.
+include_directories(
+  ${gtest_SOURCE_DIR}/include
+  ${gtest_SOURCE_DIR})
+
+# Where the gtest libraries can be found.
+link_directories(
+  ${gtest_BINARY_DIR}/src)
+
+# Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT.
+find_package(Threads)
+
+# Defines the compiler/linker flags used to build gtest.  You can
+# tweak these definitions to suit your need.  A variable's value is
+# empty before it's explicitly assigned to.
+
+if (MSVC)
+  # Newlines inside flags variables break CMake's NMake generator.
+  set(cxx_base_flags "-GS -W4 -WX -wd4275 -nologo -J -Zi")
+  set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
+  set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
+  set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
+  set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0")
+  set(cxx_no_rtti_flags "-GR-")
+elseif (CMAKE_COMPILER_IS_GNUCXX)
+  set(cxx_base_flags "-Wall -Wshadow")
+  set(cxx_exception_flags "-fexceptions")
+  set(cxx_no_exception_flags "-fno-exceptions")
+  # Until version 4.3.2, GCC doesn't define a macro to indicate
+  # whether RTTI is enabled.  Therefore we define GTEST_HAS_RTTI
+  # explicitly.
+  set(cxx_no_rtti_flags "-fno-rtti -DGTEST_HAS_RTTI=0")
+  set(cxx_strict_flags "-Wextra")
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
+  set(cxx_exception_flags "-features=except")
+  # Sun Pro doesn't provide macros to indicate whether exceptions and
+  # RTTI are enabled, so we define GTEST_HAS_* explicitly.
+  set(cxx_no_exception_flags "-features=no%except -DGTEST_HAS_EXCEPTIONS=0")
+  set(cxx_no_rtti_flags "-features=no%rtti -DGTEST_HAS_RTTI=0")
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "VisualAge" OR
+        CMAKE_CXX_COMPILER_ID STREQUAL "XL")
+  # CMake 2.8 changes Visual Age's compiler ID to "XL".
+  set(cxx_exception_flags "-qeh")
+  set(cxx_no_exception_flags "-qnoeh")
+  # Until version 9.0, Visual Age doesn't define a macro to indicate
+  # whether RTTI is enabled.  Therefore we define GTEST_HAS_RTTI
+  # explicitly.
+  set(cxx_no_rtti_flags "-qnortti -DGTEST_HAS_RTTI=0")
+endif()
+
+if (CMAKE_USE_PTHREADS_INIT)  # The pthreads library is available.
+  set(cxx_base_flags "${cxx_base_flags} -DGTEST_HAS_PTHREAD=1")
+endif()
+
+# For building gtest's own tests and samples.
+set(cxx_exception "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_exception_flags}")
+set(cxx_no_exception
+    "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_no_exception_flags}")
+set(cxx_default "${cxx_exception}")
+set(cxx_no_rtti "${cxx_default} ${cxx_no_rtti_flags}")
+set(cxx_use_own_tuple "${cxx_default} -DGTEST_USE_OWN_TR1_TUPLE=1")
+
+# For building the gtest libraries.
+set(cxx_strict "${cxx_default} ${cxx_strict_flags}")
+
+########################################################################
+#
+# Defines the gtest & gtest_main libraries.  User tests should link
+# with one of them.
+function(cxx_library_with_type name type cxx_flags)
+  # type can be either STATIC or SHARED to denote a static or shared library.
+  # ARGN refers to additional arguments after 'cxx_flags'.
+  add_library(${name} ${type} ${ARGN})
+  set_target_properties(${name}
+    PROPERTIES
+    COMPILE_FLAGS "${cxx_flags}")
+    if (CMAKE_USE_PTHREADS_INIT)
+      target_link_libraries(${name} ${CMAKE_THREAD_LIBS_INIT})
+    endif()
+endfunction()
+
+function(cxx_static_library name cxx_flags)
+  cxx_library_with_type(${name} STATIC "${cxx_flags}" ${ARGN})
+endfunction()
+
+function(cxx_shared_library name cxx_flags)
+  cxx_library_with_type(${name} SHARED "${cxx_flags}" ${ARGN})
+endfunction()
+
+function(cxx_library name cxx_flags)
+  # TODO(vladl@google.com): Make static/shared a user option.
+  cxx_static_library(${name} "${cxx_flags}" ${ARGN})
+endfunction()
+
+# Static versions of Google Test libraries.  We build them using more
+# strict warnings than what are used for other targets, to ensure that
+# gtest can be compiled by a user aggressive about warnings.
+cxx_static_library(gtest "${cxx_strict}" src/gtest-all.cc)
+cxx_static_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
+target_link_libraries(gtest_main gtest)
+
+########################################################################
+#
+# Samples on how to link user tests with gtest or gtest_main.
+#
+# They are not built by default.  To build them, set the
+# build_gtest_samples option to ON.  You can do it by running ccmake
+# or specifying the -Dbuild_gtest_samples=ON flag when running cmake.
+
+option(build_gtest_samples "Build gtest's sample programs." OFF)
+
+# cxx_executable_with_flags(name cxx_flags lib srcs...)
+#
+# creates a named C++ executable that depends on the given library and
+# is built from the given source files with the given compiler flags.
+function(cxx_executable_with_flags name cxx_flags lib)
+  add_executable(${name} ${ARGN})
+  if (cxx_flags)
+    set_target_properties(${name}
+      PROPERTIES
+      COMPILE_FLAGS "${cxx_flags}")
+  endif()
+  target_link_libraries(${name} ${lib})
+endfunction()
+
+# cxx_executable(name dir lib srcs...)
+#
+# creates a named target that depends on the given lib and is built
+# from the given source files.  dir/name.cc is implicitly included in
+# the source file list.
+function(cxx_executable name dir lib)
+  cxx_executable_with_flags(
+    ${name} "${cxx_default}" ${lib} "${dir}/${name}.cc" ${ARGN})
+endfunction()
+
+if (build_gtest_samples)
+  cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
+  cxx_executable(sample3_unittest samples gtest_main)
+  cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc)
+  cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc)
+  cxx_executable(sample6_unittest samples gtest_main)
+  cxx_executable(sample7_unittest samples gtest_main)
+  cxx_executable(sample8_unittest samples gtest_main)
+  cxx_executable(sample9_unittest samples gtest)
+  cxx_executable(sample10_unittest samples gtest)
+endif()
+
+########################################################################
+#
+# Google Test's own tests.
+#
+# You can skip this section if you aren't interested in testing
+# Google Test itself.
+#
+# Most of the tests are not built by default.  To build them, set the
+# build_all_gtest_tests option to ON.  You can do it by running ccmake
+# or specifying the -Dbuild_all_gtest_tests=ON flag when running cmake.
+
+option(build_all_gtest_tests "Build all of gtest's own tests." OFF)
+
+# This must be set in the root directory for the tests to be run by
+# 'make test' or ctest.
+enable_testing()
+
+# Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
+find_package(PythonInterp)
+
+############################################################
+# C++ tests built with standard compiler flags.
+
+# cxx_test_with_flags(name cxx_flags libs srcs...)
+#
+# creates a named C++ test that depends on the given libs and is built
+# from the given source files with the given compiler flags.
+function(cxx_test_with_flags name cxx_flags libs)
+  add_executable(${name} ${ARGN})
+  set_target_properties(${name}
+    PROPERTIES
+    COMPILE_FLAGS "${cxx_flags}")
+  # To support mixing linking in static and dynamic libraries, link each
+  # library in with an extra call to target_link_libraries.
+  foreach (lib "${libs}")
+    target_link_libraries(${name} ${lib})
+  endforeach()
+  add_test(${name} ${name})
+endfunction()
+
+# cxx_test(name libs srcs...)
+#
+# creates a named test target that depends on the given libs and is
+# built from the given source files.  Unlike cxx_test_with_flags,
+# test/name.cc is already implicitly included in the source file list.
+function(cxx_test name libs)
+  cxx_test_with_flags("${name}" "${cxx_default}" "${libs}"
+    "test/${name}.cc" ${ARGN})
+endfunction()
+
+cxx_test(gtest_unittest gtest_main)
+
+if (build_all_gtest_tests)
+  cxx_test(gtest-death-test_test gtest_main)
+  cxx_test(gtest_environment_test gtest)
+  cxx_test(gtest-filepath_test gtest_main)
+  cxx_test(gtest-linked_ptr_test gtest_main)
+  cxx_test(gtest-listener_test gtest_main)
+  cxx_test(gtest_main_unittest gtest_main)
+  cxx_test(gtest-message_test gtest_main)
+  cxx_test(gtest_no_test_unittest gtest)
+  cxx_test(gtest-options_test gtest_main)
+  cxx_test(gtest-param-test_test gtest
+    test/gtest-param-test2_test.cc)
+  cxx_test(gtest-port_test gtest_main)
+  cxx_test(gtest_pred_impl_unittest gtest_main)
+  cxx_test(gtest_prod_test gtest_main
+    test/production.cc)
+  cxx_test(gtest_repeat_test gtest)
+  cxx_test(gtest_sole_header_test gtest_main)
+  cxx_test(gtest_stress_test gtest)
+  cxx_test(gtest-test-part_test gtest_main)
+  cxx_test(gtest_throw_on_failure_ex_test gtest)
+  cxx_test(gtest-typed-test_test gtest_main
+    test/gtest-typed-test2_test.cc)
+  cxx_test(gtest-unittest-api_test gtest)
+endif()
+
+############################################################
+# C++ tests built with non-standard compiler flags.
+
+if (build_all_gtest_tests)
+  cxx_library(gtest_no_exception "${cxx_no_exception}"
+    src/gtest-all.cc)
+  cxx_library(gtest_main_no_rtti "${cxx_no_rtti}"
+    src/gtest-all.cc src/gtest_main.cc)
+
+  cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}"
+    gtest_main_no_rtti test/gtest_unittest.cc)
+
+  set(cxx_use_shared_gtest "${cxx_default} -DGTEST_LINKED_AS_SHARED_LIBRARY=1")
+  set(cxx_build_shared_gtest "${cxx_default} -DGTEST_CREATE_SHARED_LIBRARY=1")
+  if (MSVC)
+    # Disables the "class 'X' needs to have dll-interface to be used
+    # by clients of class 'Y'" warning. This particularly concerns generic
+    # classes like vector that MS doesn't mark as exported.
+    set(cxx_use_shared_gtest "${cxx_use_shared_gtest} -wd4251")
+    set(cxx_build_shared_gtest "${cxx_build_shared_gtest} -wd4251")
+  endif()
+
+  cxx_shared_library(gtest_dll "${cxx_build_shared_gtest}"
+    src/gtest-all.cc)
+
+  # TODO(vladl): This and the next tests may not run in the hermetic
+  # environment on Windows. Re-evaluate and possibly make them
+  # platform-conditional after implementing hermetic builds.
+  cxx_executable_with_flags(gtest_dll_test_ "${cxx_use_shared_gtest}"
+    gtest_dll test/gtest_all_test.cc)
+
+  if (NOT(MSVC AND (MSVC_VERSION EQUAL 1600)))
+    # The C++ Standard specifies tuple_element<int, class>.
+    # Yet MSVC 10's <utility> declares tuple_element<size_t, class>.
+    # That declaration conflicts with our own standard-conforming
+    # tuple implementation.  Therefore using our own tuple with
+    # MSVC 10 doesn't compile.
+    cxx_library(gtest_main_use_own_tuple "${cxx_use_own_tuple}"
+      src/gtest-all.cc src/gtest_main.cc)
+
+    cxx_test_with_flags(gtest-tuple_test "${cxx_use_own_tuple}"
+      gtest_main_use_own_tuple test/gtest-tuple_test.cc)
+
+    cxx_test_with_flags(gtest_use_own_tuple_test "${cxx_use_own_tuple}"
+      gtest_main_use_own_tuple
+      test/gtest-param-test_test.cc test/gtest-param-test2_test.cc)
+  endif()
+
+endif()
+
+############################################################
+# Python tests.
+
+# py_test(name)
+#
+# creates a Python test with the given name whose main module is in
+# test/name.py.  It does nothing if Python is not installed.
+function(py_test name)
+  if (PYTHONINTERP_FOUND)
+    # ${gtest_BINARY_DIR} is known at configuration time, so we can
+    # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known
+    # only at ctest runtime (by calling ctest -c <Configuration>), so
+    # we have to escape $ to delay variable substitution here.
+    add_test(${name}
+      ${PYTHON_EXECUTABLE} ${gtest_SOURCE_DIR}/test/${name}.py
+          --gtest_build_dir=${gtest_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE})
+  endif()
+endfunction()
+
+if (build_all_gtest_tests)
+  cxx_executable(gtest_break_on_failure_unittest_ test gtest)
+  py_test(gtest_break_on_failure_unittest)
+
+  cxx_executable(gtest_color_test_ test gtest)
+  py_test(gtest_color_test)
+
+  cxx_executable(gtest_env_var_test_ test gtest)
+  py_test(gtest_env_var_test)
+
+  cxx_executable(gtest_filter_unittest_ test gtest)
+  py_test(gtest_filter_unittest)
+
+  cxx_executable(gtest_help_test_ test gtest_main)
+  py_test(gtest_help_test)
+
+  cxx_executable(gtest_list_tests_unittest_ test gtest)
+  py_test(gtest_list_tests_unittest)
+
+  cxx_executable(gtest_output_test_ test gtest)
+  py_test(gtest_output_test)
+
+  cxx_executable(gtest_shuffle_test_ test gtest)
+  py_test(gtest_shuffle_test)
+
+  cxx_executable(gtest_throw_on_failure_test_ test gtest_no_exception)
+  set_target_properties(gtest_throw_on_failure_test_
+    PROPERTIES
+    COMPILE_FLAGS "${cxx_no_exception}")
+  py_test(gtest_throw_on_failure_test)
+
+  cxx_executable(gtest_uninitialized_test_ test gtest)
+  py_test(gtest_uninitialized_test)
+
+  cxx_executable(gtest_xml_outfile1_test_ test gtest_main)
+  cxx_executable(gtest_xml_outfile2_test_ test gtest_main)
+  py_test(gtest_xml_outfiles_test)
+
+  cxx_executable(gtest_xml_output_unittest_ test gtest)
+  py_test(gtest_xml_output_unittest)
+endif()

Copied: incubator/mesos/trunk/src/third_party/gtest-1.5.0/CONTRIBUTORS (from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CONTRIBUTORS)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/gtest-1.5.0/CONTRIBUTORS?p2=incubator/mesos/trunk/src/third_party/gtest-1.5.0/CONTRIBUTORS&p1=incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CONTRIBUTORS&r1=1131791&r2=1131792&rev=1131792&view=diff
==============================================================================
--- incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/CONTRIBUTORS (original)
+++ incubator/mesos/trunk/src/third_party/gtest-1.5.0/CONTRIBUTORS Sun Jun  5 05:32:17 2011
@@ -11,13 +11,16 @@ Chris Prince <cprince@google.com>
 Chris Taylor <taylorc@google.com>
 Dan Egnor <egnor@google.com>
 Eric Roman <eroman@chromium.org>
+Hady Zalek <hady.zalek@gmail.com>
 Jeffrey Yasskin <jyasskin@google.com>
 Jói Sigurðsson <joi@google.com>
 Keir Mierle <mierle@gmail.com>
 Keith Ray <keith.ray@gmail.com>
 Kenton Varda <kenton@google.com>
+Manuel Klimek <klimek@google.com>
 Markus Heule <markus.heule@gmail.com>
 Mika Raento <mikie@iki.fi>
+Miklós Fazekas <mfazekas@szemafor.com>
 Patrick Hanna <phanna@google.com>
 Patrick Riley <pfr@google.com>
 Peter Kaminski <piotrk@google.com>

Copied: incubator/mesos/trunk/src/third_party/gtest-1.5.0/COPYING (from r1131791, incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/COPYING)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/gtest-1.5.0/COPYING?p2=incubator/mesos/trunk/src/third_party/gtest-1.5.0/COPYING&p1=incubator/mesos/trunk/src/third_party/gtest-1.4.0-patched/COPYING&r1=1131791&r2=1131792&rev=1131792&view=diff
==============================================================================
    (empty)

Added: incubator/mesos/trunk/src/third_party/gtest-1.5.0/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/third_party/gtest-1.5.0/Makefile.am?rev=1131792&view=auto
==============================================================================
--- incubator/mesos/trunk/src/third_party/gtest-1.5.0/Makefile.am (added)
+++ incubator/mesos/trunk/src/third_party/gtest-1.5.0/Makefile.am Sun Jun  5 05:32:17 2011
@@ -0,0 +1,284 @@
+# Automake file
+
+# Nonstandard package files for distribution
+EXTRA_DIST = \
+  CHANGES \
+  CONTRIBUTORS \
+  include/gtest/gtest-param-test.h.pump \
+  include/gtest/internal/gtest-tuple.h.pump \
+  include/gtest/internal/gtest-type-util.h.pump \
+  include/gtest/internal/gtest-param-util-generated.h.pump \
+  make/Makefile \
+  scripts/fuse_gtest_files.py \
+  scripts/gen_gtest_pred_impl.py \
+  scripts/pump.py \
+  scripts/test/Makefile
+
+# gtest source files that we don't compile directly.  They are
+# #included by gtest-all.cc.
+GTEST_SRC = \
+  src/gtest.cc \
+  src/gtest-death-test.cc \
+  src/gtest-filepath.cc \
+  src/gtest-internal-inl.h \
+  src/gtest-port.cc \
+  src/gtest-test-part.cc \
+  src/gtest-typed-test.cc
+
+EXTRA_DIST += $(GTEST_SRC)
+
+# Sample files that we don't compile.
+EXTRA_DIST += \
+  samples/prime_tables.h \
+  samples/sample2_unittest.cc \
+  samples/sample3_unittest.cc \
+  samples/sample4_unittest.cc \
+  samples/sample5_unittest.cc \
+  samples/sample6_unittest.cc \
+  samples/sample7_unittest.cc \
+  samples/sample8_unittest.cc \
+  samples/sample9_unittest.cc
+
+# C++ test files that we don't compile directly.
+EXTRA_DIST += \
+  test/gtest-death-test_test.cc \
+  test/gtest_environment_test.cc \
+  test/gtest-filepath_test.cc \
+  test/gtest-linked_ptr_test.cc \
+  test/gtest-message_test.cc \
+  test/gtest_no_test_unittest.cc \
+  test/gtest-options_test.cc \
+  test/gtest-param-test_test.cc \
+  test/gtest-param-test2_test.cc \
+  test/gtest-param-test_test.h \
+  test/gtest-port_test.cc \
+  test/gtest_pred_impl_unittest.cc \
+  test/gtest_prod_test.cc \
+  test/production.cc \
+  test/production.h \
+  test/gtest_repeat_test.cc \
+  test/gtest_sole_header_test.cc \
+  test/gtest_stress_test.cc \
+  test/gtest-test-part_test.cc \
+  test/gtest_throw_on_failure_ex_test.cc \
+  test/gtest-typed-test_test.cc \
+  test/gtest-typed-test2_test.cc \
+  test/gtest-typed-test_test.h \
+  test/gtest_unittest.cc \
+  test/gtest-unittest-api_test.cc \
+  test/gtest-listener_test.cc \
+  test/gtest_main_unittest.cc \
+  test/gtest_unittest.cc \
+  test/gtest-tuple_test.cc \
+  test/gtest-param-test_test.cc \
+  test/gtest-param-test2_test.cc \
+  test/gtest_break_on_failure_unittest_.cc \
+  test/gtest_color_test_.cc \
+  test/gtest_env_var_test_.cc \
+  test/gtest_filter_unittest_.cc \
+  test/gtest_help_test_.cc \
+  test/gtest_list_tests_unittest_.cc \
+  test/gtest_output_test_.cc \
+  test/gtest_shuffle_test_.cc \
+  test/gtest_throw_on_failure_test_.cc \
+  test/gtest_uninitialized_test_.cc \
+  test/gtest_xml_outfile1_test_.cc \
+  test/gtest_xml_outfile2_test_.cc \
+  test/gtest_xml_output_unittest_.cc
+
+# Python tests that we don't run.
+EXTRA_DIST += \
+  test/gtest_test_utils.py \
+  test/gtest_xml_test_utils.py \
+  test/gtest_break_on_failure_unittest.py \
+  test/gtest_color_test.py \
+  test/gtest_env_var_test.py \
+  test/gtest_filter_unittest.py \
+  test/gtest_help_test.py \
+  test/gtest_list_tests_unittest.py \
+  test/gtest_output_test.py \
+  test/gtest_output_test_golden_lin.txt \
+  test/gtest_output_test_golden_win.txt \
+  test/gtest_shuffle_test.py \
+  test/gtest_throw_on_failure_test.py \
+  test/gtest_uninitialized_test.py \
+  test/gtest_xml_outfiles_test.py \
+  test/gtest_xml_output_unittest.py \
+  test/run_tests_util.py \
+  test/run_tests_util_test.py
+
+# CMake script
+EXTRA_DIST += \
+  CMakeLists.txt
+
+# MSVC project files
+EXTRA_DIST += \
+  msvc/gtest-md.sln \
+  msvc/gtest.sln \
+  msvc/gtest-md.vcproj \
+  msvc/gtest.vcproj \
+  msvc/gtest_main-md.vcproj \
+  msvc/gtest_main.vcproj \
+  msvc/gtest_prod_test-md.vcproj \
+  msvc/gtest_prod_test.vcproj \
+  msvc/gtest_unittest-md.vcproj \
+  msvc/gtest_unittest.vcproj
+
+# xcode project files
+EXTRA_DIST += \
+  xcode/Config/DebugProject.xcconfig \
+  xcode/Config/FrameworkTarget.xcconfig \
+  xcode/Config/General.xcconfig \
+  xcode/Config/ReleaseProject.xcconfig \
+  xcode/Config/StaticLibraryTarget.xcconfig \
+  xcode/Config/TestTarget.xcconfig \
+  xcode/Resources/Info.plist \
+  xcode/Scripts/versiongenerate.py \
+  xcode/Scripts/runtests.sh \
+  xcode/gtest.xcodeproj/project.pbxproj
+
+# xcode sample files
+EXTRA_DIST += \
+  xcode/Samples/FrameworkSample/Info.plist \
+  xcode/Samples/FrameworkSample/runtests.sh \
+  xcode/Samples/FrameworkSample/widget_test.cc \
+  xcode/Samples/FrameworkSample/widget.cc \
+  xcode/Samples/FrameworkSample/widget.h \
+  xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
+
+# C++Builder project files
+EXTRA_DIST += \
+  codegear/gtest_all.cc \
+  codegear/gtest_link.cc \
+  codegear/gtest.cbproj \
+  codegear/gtest_main.cbproj \
+  codegear/gtest_unittest.cbproj \
+  codegear/gtest.groupproj
+
+# Scripts and utilities
+bin_SCRIPTS = scripts/gtest-config
+CLEANFILES = $(bin_SCRIPTS)
+
+# Distribute and install M4 macro
+m4datadir = $(datadir)/aclocal
+m4data_DATA = m4/gtest.m4
+EXTRA_DIST += $(m4data_DATA)
+
+# We define the global AM_CPPFLAGS as everything we compile includes from these
+# directories.
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
+
+# Modifies compiler and linker flags for pthreads compatibility.
+if HAVE_PTHREADS
+  AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1
+  AM_LIBS = @PTHREAD_LIBS@
+else
+  AM_CXXFLAGS = -DGTEST_HAS_PTHREAD=0
+endif
+
+# Build rules for libraries.
+lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
+
+lib_libgtest_la_SOURCES = src/gtest-all.cc
+
+pkginclude_HEADERS = include/gtest/gtest.h \
+                     include/gtest/gtest-death-test.h \
+                     include/gtest/gtest-message.h \
+                     include/gtest/gtest-param-test.h \
+                     include/gtest/gtest_pred_impl.h \
+                     include/gtest/gtest_prod.h \
+                     include/gtest/gtest-spi.h \
+                     include/gtest/gtest-test-part.h \
+                     include/gtest/gtest-typed-test.h
+
+pkginclude_internaldir = $(pkgincludedir)/internal
+pkginclude_internal_HEADERS = \
+  include/gtest/internal/gtest-death-test-internal.h \
+  include/gtest/internal/gtest-filepath.h \
+  include/gtest/internal/gtest-internal.h \
+  include/gtest/internal/gtest-linked_ptr.h \
+  include/gtest/internal/gtest-param-util-generated.h \
+  include/gtest/internal/gtest-param-util.h \
+  include/gtest/internal/gtest-port.h \
+  include/gtest/internal/gtest-string.h \
+  include/gtest/internal/gtest-tuple.h \
+  include/gtest/internal/gtest-type-util.h
+
+lib_libgtest_main_la_SOURCES = src/gtest_main.cc
+lib_libgtest_main_la_LIBADD = lib/libgtest.la
+
+# Bulid rules for samples and tests. Automake's naming for some of
+# these variables isn't terribly obvious, so this is a brief
+# reference:
+#
+# TESTS -- Programs run automatically by "make check"
+# check_PROGRAMS -- Programs built by "make check" but not necessarily run
+
+noinst_LTLIBRARIES = samples/libsamples.la
+
+samples_libsamples_la_SOURCES = samples/sample1.cc \
+                                samples/sample1.h \
+                                samples/sample2.cc \
+                                samples/sample2.h \
+                                samples/sample3-inl.h \
+                                samples/sample4.cc \
+                                samples/sample4.h
+
+TESTS=
+TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
+                    GTEST_BUILD_DIR="$(top_builddir)/test"
+check_PROGRAMS=
+
+# A simple sample on using gtest.
+TESTS += samples/sample1_unittest
+check_PROGRAMS += samples/sample1_unittest
+samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
+samples_sample1_unittest_LDADD = lib/libgtest_main.la \
+                                 samples/libsamples.la
+
+# Another sample.  It also verifies that libgtest works.
+TESTS += samples/sample10_unittest
+check_PROGRAMS += samples/sample10_unittest
+samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc
+samples_sample10_unittest_LDADD = lib/libgtest.la
+
+# This tests most constructs of gtest and verifies that libgtest_main
+# works.
+TESTS += test/gtest_all_test
+check_PROGRAMS += test/gtest_all_test
+test_gtest_all_test_SOURCES = test/gtest_all_test.cc
+test_gtest_all_test_LDADD = lib/libgtest_main.la
+
+# Tests that fused gtest files compile and work.
+FUSED_GTEST_SRC = \
+  fused-src/gtest/gtest-all.cc \
+  fused-src/gtest/gtest_main.cc \
+  fused-src/gtest/gtest.h
+
+TESTS += test/fused_gtest_test
+check_PROGRAMS += test/fused_gtest_test
+test_fused_gtest_test_SOURCES = $(FUSED_GTEST_SRC) \
+                                samples/sample1.cc samples/sample1_unittest.cc
+test_fused_gtest_test_CPPFLAGS = -I"$(srcdir)/fused-src"
+
+# Build rules for putting fused Google Test files into the distribution
+# package. The user can also create those files by manually running
+# scripts/fuse_gtest_files.py.
+$(test_fused_gtest_test_SOURCES): fused-gtest
+
+fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
+             $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \
+             scripts/fuse_gtest_files.py
+	mkdir -p "$(srcdir)/fused-src"
+	chmod -R u+w "$(srcdir)/fused-src"
+	rm -f "$(srcdir)/fused-src/gtest/gtest-all.cc"
+	rm -f "$(srcdir)/fused-src/gtest/gtest.h"
+	"$(srcdir)/scripts/fuse_gtest_files.py" "$(srcdir)/fused-src"
+	cp -f "$(srcdir)/src/gtest_main.cc" "$(srcdir)/fused-src/gtest/"
+
+maintainer-clean-local:
+	rm -rf "$(srcdir)/fused-src"
+
+# Death tests may produce core dumps in the build directory. In case
+# this happens, clean them to keep distcleancheck happy.
+CLEANFILES += core



Mime
View raw message