-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Package: libgtest-dev
Version: 1.7.0-4

This is the warning (which might be fatal when treating them as
errors) we get when compiling tests using TEST_P with new gcc:

'{anonymous}::Property_CopyBaseTypeConstructor_Test::gtest_registering_d
ummy_'
defined but not used [-Werror=unused-variable]
 TEST_P(/*TestDesktopApplicationSubject*/Property,
CopyBaseTypeConstructor)

Attached a fix for this
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iF4EAREIAAYFAlZcmKgACgkQy6VOJFdF1OpSMAD9EdtTeUhf+QBTrl4clksW4epm
+g0KnTsCMlnz6sNt0p8A/RdOaQbyV9Szp/OmADLHAHksUZ8+aQXa8FusAAqeH/h/
=6X6n
-----END PGP SIGNATURE-----
diff -Nru gtest-1.7.0/debian/changelog gtest-1.7.0/debian/changelog
--- gtest-1.7.0/debian/changelog        2015-06-24 05:31:45.000000000 +0200
+++ gtest-1.7.0/debian/changelog        2015-11-30 19:28:14.000000000 +0100
@@ -1,3 +1,11 @@
+gtest (1.7.0-5) unstable; urgency=medium
+
+  * patches/test-case-p-unused-dummy-variable-fix.patch:
+    -  Add GTEST_ATTRIBUTE_UNUSED_ to the dummy variable generated
+       in INSTANTIATE_TEST_CASE_P (LP: #1521177).
+
+ -- Marco Trevisan (TreviƱo) <ma...@ubuntu.com>  Mon, 30 Nov 2015 13:44:53 
+0100
+
 gtest (1.7.0-4) unstable; urgency=medium
 
   * patches/gtest-freebsd-death-test.patch: New.  Enable death tests for
diff -Nru gtest-1.7.0/debian/patches/series gtest-1.7.0/debian/patches/series
--- gtest-1.7.0/debian/patches/series   2015-06-24 05:31:45.000000000 +0200
+++ gtest-1.7.0/debian/patches/series   2015-11-30 13:31:11.000000000 +0100
@@ -1,3 +1,4 @@
 death-test-test.patch
 makefile-example.patch
 gtest-freebsd-death-test.patch
+test-case-p-unused-dummy-variable-fix.patch
diff -Nru 
gtest-1.7.0/debian/patches/test-case-p-unused-dummy-variable-fix.patch 
gtest-1.7.0/debian/patches/test-case-p-unused-dummy-variable-fix.patch
--- gtest-1.7.0/debian/patches/test-case-p-unused-dummy-variable-fix.patch      
1970-01-01 01:00:00.000000000 +0100
+++ gtest-1.7.0/debian/patches/test-case-p-unused-dummy-variable-fix.patch      
2015-11-30 15:56:02.000000000 +0100
@@ -0,0 +1,34 @@
+Description: Add GTEST_ATTRIBUTE_UNUSED_ to the dummy variable generated
+  in INSTANTIATE_TEST_CASE_P.
+
+Origin: 
https://github.com/google/googletest/commit/683886c5676dca2e8198bbf5f735f79387d10fc6
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gtest/+bug/1521177
+Applied-Upstream: commit:683886c5676dca2e8198bbf5f735f79387d10fc6
+Author: kosak <ko...@google.com>
+
+diff --git a/include/gtest/gtest-param-test.h 
b/include/gtest/gtest-param-test.h
+index adcc49b..0b61629 100644
+--- a/include/gtest/gtest-param-test.h
++++ b/include/gtest/gtest-param-test.h
+@@ -1394,7 +1394,7 @@ internal::CartesianProductHolder10<Generator1, 
Generator2, Generator3,
+                       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)); \
+   }; \
+diff --git a/include/gtest/gtest-param-test.h.pump 
b/include/gtest/gtest-param-test.h.pump
+index 55ddd2d..8033f49 100644
+--- a/include/gtest/gtest-param-test.h.pump
++++ b/include/gtest/gtest-param-test.h.pump
+@@ -460,7 +460,7 @@ internal::CartesianProductHolder$i<$for j, 
[[Generator$j]]> Combine(
+                       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)); \
+   }; \

Attachment: gtest_1.7.0-5.dsc.debdiff.sig
Description: PGP signature

Reply via email to