Merge lp://staging/~renatofilho/sync-monitor/no-gmock into lp://staging/sync-monitor
Proposed by
Renato Araujo Oliveira Filho
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~renatofilho/sync-monitor/no-gmock |
| Merge into: | lp://staging/sync-monitor |
| Diff against target: |
68118 lines (+83/-67189) 158 files modified
3rd_party/CMakeLists.txt (+0/-1) 3rd_party/gmock/CMakeLists.txt (+0/-171) 3rd_party/gmock/gtest/CHANGES (+0/-153) 3rd_party/gmock/gtest/CMakeLists.txt (+0/-250) 3rd_party/gmock/gtest/CONTRIBUTORS (+0/-37) 3rd_party/gmock/gtest/Makefile.am (+0/-305) 3rd_party/gmock/gtest/README (+0/-435) 3rd_party/gmock/gtest/cmake/internal_utils.cmake (+0/-227) 3rd_party/gmock/gtest/codegear/gtest_all.cc (+0/-38) 3rd_party/gmock/gtest/codegear/gtest_link.cc (+0/-40) 3rd_party/gmock/gtest/configure.ac (+0/-68) 3rd_party/gmock/gtest/include/gtest/gtest-death-test.h (+0/-294) 3rd_party/gmock/gtest/include/gtest/gtest-message.h (+0/-250) 3rd_party/gmock/gtest/include/gtest/gtest-param-test.h (+0/-1421) 3rd_party/gmock/gtest/include/gtest/gtest-param-test.h.pump (+0/-487) 3rd_party/gmock/gtest/include/gtest/gtest-printers.h (+0/-855) 3rd_party/gmock/gtest/include/gtest/gtest-spi.h (+0/-232) 3rd_party/gmock/gtest/include/gtest/gtest-test-part.h (+0/-179) 3rd_party/gmock/gtest/include/gtest/gtest-typed-test.h (+0/-259) 3rd_party/gmock/gtest/include/gtest/gtest.h (+0/-2291) 3rd_party/gmock/gtest/include/gtest/gtest_pred_impl.h (+0/-358) 3rd_party/gmock/gtest/include/gtest/gtest_prod.h (+0/-58) 3rd_party/gmock/gtest/include/gtest/internal/gtest-death-test-internal.h (+0/-319) 3rd_party/gmock/gtest/include/gtest/internal/gtest-filepath.h (+0/-206) 3rd_party/gmock/gtest/include/gtest/internal/gtest-internal.h (+0/-1147) 3rd_party/gmock/gtest/include/gtest/internal/gtest-linked_ptr.h (+0/-233) 3rd_party/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h (+0/-5143) 3rd_party/gmock/gtest/include/gtest/internal/gtest-param-util-generated.h.pump (+0/-301) 3rd_party/gmock/gtest/include/gtest/internal/gtest-param-util.h (+0/-619) 3rd_party/gmock/gtest/include/gtest/internal/gtest-port.h (+0/-1947) 3rd_party/gmock/gtest/include/gtest/internal/gtest-string.h (+0/-167) 3rd_party/gmock/gtest/include/gtest/internal/gtest-tuple.h (+0/-1012) 3rd_party/gmock/gtest/include/gtest/internal/gtest-tuple.h.pump (+0/-339) 3rd_party/gmock/gtest/include/gtest/internal/gtest-type-util.h (+0/-3331) 3rd_party/gmock/gtest/include/gtest/internal/gtest-type-util.h.pump (+0/-297) 3rd_party/gmock/gtest/m4/acx_pthread.m4 (+0/-363) 3rd_party/gmock/gtest/m4/gtest.m4 (+0/-74) 3rd_party/gmock/gtest/make/Makefile (+0/-82) 3rd_party/gmock/gtest/samples/prime_tables.h (+0/-123) 3rd_party/gmock/gtest/samples/sample1.cc (+0/-68) 3rd_party/gmock/gtest/samples/sample1.h (+0/-43) 3rd_party/gmock/gtest/samples/sample10_unittest.cc (+0/-144) 3rd_party/gmock/gtest/samples/sample1_unittest.cc (+0/-153) 3rd_party/gmock/gtest/samples/sample2.cc (+0/-56) 3rd_party/gmock/gtest/samples/sample2.h (+0/-85) 3rd_party/gmock/gtest/samples/sample2_unittest.cc (+0/-109) 3rd_party/gmock/gtest/samples/sample3-inl.h (+0/-172) 3rd_party/gmock/gtest/samples/sample3_unittest.cc (+0/-151) 3rd_party/gmock/gtest/samples/sample4.cc (+0/-46) 3rd_party/gmock/gtest/samples/sample4.h (+0/-53) 3rd_party/gmock/gtest/samples/sample4_unittest.cc (+0/-45) 3rd_party/gmock/gtest/samples/sample5_unittest.cc (+0/-199) 3rd_party/gmock/gtest/samples/sample6_unittest.cc (+0/-224) 3rd_party/gmock/gtest/samples/sample7_unittest.cc (+0/-130) 3rd_party/gmock/gtest/samples/sample8_unittest.cc (+0/-173) 3rd_party/gmock/gtest/samples/sample9_unittest.cc (+0/-160) 3rd_party/gmock/gtest/scripts/fuse_gtest_files.py (+0/-250) 3rd_party/gmock/gtest/scripts/gen_gtest_pred_impl.py (+0/-730) 3rd_party/gmock/gtest/scripts/gtest-config.in (+0/-274) 3rd_party/gmock/gtest/scripts/pump.py (+0/-855) 3rd_party/gmock/gtest/scripts/test/Makefile (+0/-59) 3rd_party/gmock/gtest/scripts/upload.py (+0/-1387) 3rd_party/gmock/gtest/scripts/upload_gtest.py (+0/-78) 3rd_party/gmock/gtest/src/gtest-all.cc (+0/-48) 3rd_party/gmock/gtest/src/gtest-death-test.cc (+0/-1344) 3rd_party/gmock/gtest/src/gtest-filepath.cc (+0/-382) 3rd_party/gmock/gtest/src/gtest-internal-inl.h (+0/-1218) 3rd_party/gmock/gtest/src/gtest-port.cc (+0/-805) 3rd_party/gmock/gtest/src/gtest-printers.cc (+0/-363) 3rd_party/gmock/gtest/src/gtest-test-part.cc (+0/-110) 3rd_party/gmock/gtest/src/gtest-typed-test.cc (+0/-110) 3rd_party/gmock/gtest/src/gtest.cc (+0/-4961) 3rd_party/gmock/gtest/src/gtest_main.cc (+0/-38) 3rd_party/gmock/gtest/test/gtest-death-test_ex_test.cc (+0/-93) 3rd_party/gmock/gtest/test/gtest-death-test_test.cc (+0/-1368) 3rd_party/gmock/gtest/test/gtest-filepath_test.cc (+0/-680) 3rd_party/gmock/gtest/test/gtest-linked_ptr_test.cc (+0/-154) 3rd_party/gmock/gtest/test/gtest-listener_test.cc (+0/-310) 3rd_party/gmock/gtest/test/gtest-message_test.cc (+0/-159) 3rd_party/gmock/gtest/test/gtest-options_test.cc (+0/-215) 3rd_party/gmock/gtest/test/gtest-param-test2_test.cc (+0/-65) 3rd_party/gmock/gtest/test/gtest-param-test_test.cc (+0/-904) 3rd_party/gmock/gtest/test/gtest-param-test_test.h (+0/-57) 3rd_party/gmock/gtest/test/gtest-port_test.cc (+0/-1253) 3rd_party/gmock/gtest/test/gtest-printers_test.cc (+0/-1566) 3rd_party/gmock/gtest/test/gtest-test-part_test.cc (+0/-208) 3rd_party/gmock/gtest/test/gtest-tuple_test.cc (+0/-320) 3rd_party/gmock/gtest/test/gtest-typed-test2_test.cc (+0/-45) 3rd_party/gmock/gtest/test/gtest-typed-test_test.cc (+0/-360) 3rd_party/gmock/gtest/test/gtest-typed-test_test.h (+0/-66) 3rd_party/gmock/gtest/test/gtest-unittest-api_test.cc (+0/-341) 3rd_party/gmock/gtest/test/gtest_all_test.cc (+0/-47) 3rd_party/gmock/gtest/test/gtest_break_on_failure_unittest.py (+0/-218) 3rd_party/gmock/gtest/test/gtest_break_on_failure_unittest_.cc (+0/-88) 3rd_party/gmock/gtest/test/gtest_catch_exceptions_test.py (+0/-223) 3rd_party/gmock/gtest/test/gtest_catch_exceptions_test_.cc (+0/-311) 3rd_party/gmock/gtest/test/gtest_color_test.py (+0/-130) 3rd_party/gmock/gtest/test/gtest_color_test_.cc (+0/-71) 3rd_party/gmock/gtest/test/gtest_env_var_test.py (+0/-103) 3rd_party/gmock/gtest/test/gtest_env_var_test_.cc (+0/-126) 3rd_party/gmock/gtest/test/gtest_environment_test.cc (+0/-192) 3rd_party/gmock/gtest/test/gtest_filter_unittest.py (+0/-633) 3rd_party/gmock/gtest/test/gtest_filter_unittest_.cc (+0/-140) 3rd_party/gmock/gtest/test/gtest_help_test.py (+0/-172) 3rd_party/gmock/gtest/test/gtest_help_test_.cc (+0/-46) 3rd_party/gmock/gtest/test/gtest_list_tests_unittest.py (+0/-207) 3rd_party/gmock/gtest/test/gtest_list_tests_unittest_.cc (+0/-157) 3rd_party/gmock/gtest/test/gtest_main_unittest.cc (+0/-45) 3rd_party/gmock/gtest/test/gtest_no_test_unittest.cc (+0/-56) 3rd_party/gmock/gtest/test/gtest_output_test.py (+0/-335) 3rd_party/gmock/gtest/test/gtest_output_test_.cc (+0/-1034) 3rd_party/gmock/gtest/test/gtest_output_test_golden_lin.txt (+0/-720) 3rd_party/gmock/gtest/test/gtest_pred_impl_unittest.cc (+0/-2427) 3rd_party/gmock/gtest/test/gtest_prod_test.cc (+0/-57) 3rd_party/gmock/gtest/test/gtest_repeat_test.cc (+0/-253) 3rd_party/gmock/gtest/test/gtest_shuffle_test.py (+0/-325) 3rd_party/gmock/gtest/test/gtest_shuffle_test_.cc (+0/-103) 3rd_party/gmock/gtest/test/gtest_sole_header_test.cc (+0/-57) 3rd_party/gmock/gtest/test/gtest_stress_test.cc (+0/-256) 3rd_party/gmock/gtest/test/gtest_test_utils.py (+0/-305) 3rd_party/gmock/gtest/test/gtest_throw_on_failure_ex_test.cc (+0/-92) 3rd_party/gmock/gtest/test/gtest_throw_on_failure_test.py (+0/-171) 3rd_party/gmock/gtest/test/gtest_throw_on_failure_test_.cc (+0/-72) 3rd_party/gmock/gtest/test/gtest_uninitialized_test.py (+0/-70) 3rd_party/gmock/gtest/test/gtest_uninitialized_test_.cc (+0/-43) 3rd_party/gmock/gtest/test/gtest_unittest.cc (+0/-7415) 3rd_party/gmock/gtest/test/gtest_xml_outfile1_test_.cc (+0/-49) 3rd_party/gmock/gtest/test/gtest_xml_outfile2_test_.cc (+0/-49) 3rd_party/gmock/gtest/test/gtest_xml_outfiles_test.py (+0/-132) 3rd_party/gmock/gtest/test/gtest_xml_output_unittest.py (+0/-307) 3rd_party/gmock/gtest/test/gtest_xml_output_unittest_.cc (+0/-181) 3rd_party/gmock/gtest/test/gtest_xml_test_utils.py (+0/-194) 3rd_party/gmock/gtest/test/production.cc (+0/-36) 3rd_party/gmock/gtest/test/production.h (+0/-55) 3rd_party/gmock/gtest/xcode/Config/DebugProject.xcconfig (+0/-30) 3rd_party/gmock/gtest/xcode/Config/FrameworkTarget.xcconfig (+0/-17) 3rd_party/gmock/gtest/xcode/Config/General.xcconfig (+0/-41) 3rd_party/gmock/gtest/xcode/Config/ReleaseProject.xcconfig (+0/-32) 3rd_party/gmock/gtest/xcode/Config/StaticLibraryTarget.xcconfig (+0/-18) 3rd_party/gmock/gtest/xcode/Config/TestTarget.xcconfig (+0/-8) 3rd_party/gmock/gtest/xcode/Resources/Info.plist (+0/-30) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/Info.plist (+0/-28) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/runtests.sh (+0/-62) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/widget.cc (+0/-63) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/widget.h (+0/-59) 3rd_party/gmock/gtest/xcode/Samples/FrameworkSample/widget_test.cc (+0/-68) 3rd_party/gmock/gtest/xcode/Scripts/runtests.sh (+0/-65) 3rd_party/gmock/gtest/xcode/Scripts/versiongenerate.py (+0/-100) 3rd_party/gmock/src/gmock-all.cc (+0/-47) 3rd_party/gmock/src/gmock-cardinalities.cc (+0/-156) 3rd_party/gmock/src/gmock-internal-utils.cc (+0/-174) 3rd_party/gmock/src/gmock-matchers.cc (+0/-137) 3rd_party/gmock/src/gmock-spec-builders.cc (+0/-813) 3rd_party/gmock/src/gmock.cc (+0/-182) 3rd_party/gmock/src/gmock_main.cc (+0/-54) CMakeLists.txt (+6/-1) cmake/FindGtest.cmake (+68/-0) tests/unittest/CMakeLists.txt (+9/-2) |
| To merge this branch: | bzr merge lp://staging/~renatofilho/sync-monitor/no-gmock |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| system-apps-ci-bot | continuous-integration | Needs Fixing | |
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
Use gmock from system instead of keep a copy internally.
To post a comment you must log in.
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
- 100. By Renato Araujo Oliveira Filho
-
Use gmock from system intead of keep a copy internally.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:103
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/