Update googletests 1.8.0 (20160822) (#7738)

* restore Google Test 1.7.0 (get patch)

* ts: update Google Test to 1.8.0 release

https://github.com/google/googletest

* ts: re-apply OpenCV patch for gtest

* ts: fixes for gtest 1.8.0

* ts: workaround MSVS2015 problem in gtest

modules/ts/include/opencv2/ts/cuda_test.hpp

@@ -180,14 +180,17 @@ namespace cvtest
         static int AddToRegistry() { \
           ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
               GetTestCasePatternHolder<test_case_name>(\
-                  #test_case_name, __FILE__, __LINE__)->AddTestPattern(\
+                  #test_case_name, \
-                      #test_case_name, \
+                  ::testing::internal::CodeLocation(\
-                      #test_name, \
+                      __FILE__, __LINE__))->AddTestPattern(\
-                      new ::testing::internal::TestMetaFactory< \
+                          #test_case_name, \
-                          GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \
+                          #test_name, \
+                          new ::testing::internal::TestMetaFactory< \
+                              GTEST_TEST_CLASS_NAME_(\
+                                  test_case_name, test_name)>()); \
           return 0; \
         } \
-        static int gtest_registering_dummy_; \
+        static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \
         GTEST_DISALLOW_COPY_AND_ASSIGN_(\
             GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
       }; \

modules/ts/include/opencv2/ts/ts_ext.hpp

@@ -27,6 +27,7 @@ void checkIppStatus();
       ::test_info_ =\
         ::testing::internal::MakeAndRegisterTestInfo(\
             #test_case_name, #test_name, NULL, NULL, \
+            ::testing::internal::CodeLocation(__FILE__, __LINE__), \
             (::testing::internal::GetTestTypeId()), \
             ::testing::Test::SetUpTestCase, \
             ::testing::Test::TearDownTestCase, \
@@ -52,6 +53,7 @@ void checkIppStatus();
       ::test_info_ =\
         ::testing::internal::MakeAndRegisterTestInfo(\
             #test_fixture, #test_name, NULL, NULL, \
+            ::testing::internal::CodeLocation(__FILE__, __LINE__), \
             (::testing::internal::GetTypeId<test_fixture>()), \
             test_fixture::SetUpTestCase, \
             test_fixture::TearDownTestCase, \
@@ -72,14 +74,17 @@ void checkIppStatus();
     static int AddToRegistry() { \
       ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
           GetTestCasePatternHolder<test_case_name>(\
-              #test_case_name, __FILE__, __LINE__)->AddTestPattern(\
+              #test_case_name, \
-                  #test_case_name, \
+              ::testing::internal::CodeLocation(\
-                  #test_name, \
+                  __FILE__, __LINE__))->AddTestPattern(\
-                  new ::testing::internal::TestMetaFactory< \
+                      #test_case_name, \
-                      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \
+                      #test_name, \
+                      new ::testing::internal::TestMetaFactory< \
+                          GTEST_TEST_CLASS_NAME_(\
+                              test_case_name, test_name)>()); \
       return 0; \
     } \
-    static int gtest_registering_dummy_; \
+    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \
     GTEST_DISALLOW_COPY_AND_ASSIGN_(\
         GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
   }; \