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 13:50:51.000000000 +0100 @@ -1,3 +1,11 @@ +gtest (1.7.0-4ubuntu1) UNRELEASED; 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) 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/control gtest-1.7.0/debian/control --- gtest-1.7.0/debian/control 2015-06-24 05:31:45.000000000 +0200 +++ gtest-1.7.0/debian/control 2015-11-30 13:56:27.000000000 +0100 @@ -1,7 +1,8 @@ Source: gtest Homepage: http://code.google.com/p/googletest/ Section: devel -Maintainer: Steve M. Robbins +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Steve M. Robbins Uploaders: Giuseppe Iuculano Priority: optional Build-Depends: debhelper (>= 9), autotools-dev, cmake, python diff -Nru gtest-1.7.0/debian/patches/patch gtest-1.7.0/debian/patches/patch --- gtest-1.7.0/debian/patches/patch 1970-01-01 01:00:00.000000000 +0100 +++ gtest-1.7.0/debian/patches/patch 2015-11-30 13:29:40.000000000 +0100 @@ -0,0 +1,37 @@ +From 683886c5676dca2e8198bbf5f735f79387d10fc6 Mon Sep 17 00:00:00 2001 +From: kosak +Date: Tue, 14 Jul 2015 20:29:34 +0000 +Subject: [PATCH] Add GTEST_ATTRIBUTE_UNUSED_ to the dummy variable generated + in INSTANTIATE_TEST_CASE_P. + +--- + include/gtest/gtest-param-test.h | 2 +- + include/gtest/gtest-param-test.h.pump | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +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()); \ + 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)); \ + }; \ 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 + +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()); \ + 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)); \ + }; \