diff options
| author | phajdan.jr <phajdan.jr@chromium.org> | 2015-07-17 22:42:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-18 05:42:34 +0000 |
| commit | b0f0c9c4983629306e7a781168fdcc660d8b73d6 (patch) | |
| tree | 72db4472f35fb87f459984ff9687755b91747223 | |
| parent | be0e52c5a2d7d4ac10879ee53c8f2a71f6f89a12 (diff) | |
| download | chromium_src-b0f0c9c4983629306e7a781168fdcc660d8b73d6.zip chromium_src-b0f0c9c4983629306e7a781168fdcc660d8b73d6.tar.gz chromium_src-b0f0c9c4983629306e7a781168fdcc660d8b73d6.tar.bz2 | |
Roll src/testing/gtest/ to 00a70a9667d92a4695d84e4fa36b64f611f147da.
$ git log 23574bf23..00a70a966 --date=short --format='%ad %ae %s'
2015-07-17 kosak Implement GetThreadCount for Linux.
2015-07-17 kosak Add support for --gtest_flagfile.
2015-07-17 kosak Add support for --gtest_flagfile
2015-07-14 kosak Minor refactoring.
2015-07-14 kosak Change GetDefaultFilter to allow for the injection of a custom filter.
2015-07-14 kosak Add support for gtest custom printers.
2015-07-14 kosak Add comment.
2015-07-14 kosak Remove TestPrematureExitFileEnvVarIsSet
2015-07-14 kosak Minor changes.
2015-07-14 kosak Add GTEST_ATTRIBUTE_UNUSED_ to the dummy variable generated in INSTANTIATE_TEST_CASE_P.
2015-07-14 kosak Control death test with an #ifdef guard.
2015-07-14 kosak Create custom/gtest-port.h to hold custom logic.
2015-07-13 kosak Add GTEST_ATTRIBUTE_UNUSED_ to the dummy variable generated in INSTANTIATE_TEST_CASE_P.
2015-07-13 kosak fully-qualify use of scoped_ptr name
BUG=none
Review URL: https://codereview.chromium.org/1240893005
Cr-Commit-Position: refs/heads/master@{#339389}
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | content/public/test/browser_test.h | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -105,7 +105,7 @@ deps = { Var('chromium_git') + '/external/github.com/google/open-vcdiff.git' + '@' + '39ff500790fa8038f80bd2fdcd10c35568a12529', 'src/testing/gtest': - Var('chromium_git') + '/external/googletest.git' + '@' + '23574bf2333f834ff665f894c97bef8a5b33a0a9', # from svn revision 711 + Var('chromium_git') + '/external/googletest.git' + '@' + '00a70a9667d92a4695d84e4fa36b64f611f147da', # from svn revision 725 'src/testing/gmock': Var('chromium_git') + '/external/googlemock.git' + '@' + '29763965ab52f24565299976b936d1265cb6a271', # from svn revision 501 diff --git a/content/public/test/browser_test.h b/content/public/test/browser_test.h index c8828d6..a9875b9 100644 --- a/content/public/test/browser_test.h +++ b/content/public/test/browser_test.h @@ -40,6 +40,7 @@ #test_name, \ "", \ "", \ + ::testing::internal::CodeLocation(__FILE__, __LINE__), \ (parent_id), \ parent_class::SetUpTestCase, \ parent_class::TearDownTestCase, \ @@ -66,7 +67,8 @@ ::testing::UnitTest::GetInstance() \ ->parameterized_test_registry() \ .GetTestCasePatternHolder<test_case_name>( \ - #test_case_name, __FILE__, __LINE__) \ + #test_case_name, \ + ::testing::internal::CodeLocation(__FILE__, __LINE__)) \ ->AddTestPattern( \ #test_case_name, \ #test_name, \ |