ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-24 03:29:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: c++-gsl: Fix build with GCC 10.

Browse source 
* gnu/packages/cpp.scm (c++-gsl)[source]: Add a patch from Debian
  to fix compilation of a test.
* gnu/packages/patches/c++-gsl-move-array-bounds-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
This commit is contained in:
Felix Gruber 2021-09-05 17:09:28 +00:00 committed by Guillaume Le Vaillant
parent 6900b3c1aa
commit 86af6091d8
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
3 changed files with 130 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -950,6 +950,7 @@ dist_patch_DATA = \
%D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
%D%/packages/patches/cyrus-sasl-CVE-2019-19906.patch \
%D%/packages/patches/c++-gsl-find-system-gtest.patch \
%D%/packages/patches/c++-gsl-move-array-bounds-tests.patch \
%D%/packages/patches/date-output-pkg-config-files.patch \
%D%/packages/patches/datefudge-gettimeofday.patch \
%D%/packages/patches/dbacl-include-locale.h.patch \

4
gnu/packages/cpp.scm
View file

@ -18,6 +18,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Milkey Mouse <milkeymouse@meme.institute>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
@ -127,7 +128,8 @@ (define-public c++-gsl
(git-file-name name version))
(patches
(search-patches
"c++-gsl-find-system-gtest.patch"))
"c++-gsl-find-system-gtest.patch"
"c++-gsl-move-array-bounds-tests.patch"))
(sha256
(base32 "0gbvr48f03830g3154bjhw92b8ggmg6wwh5xyb8nppk9v6w752l0"))))
(build-system cmake-build-system)

126
gnu/packages/patches/c++-gsl-move-array-bounds-tests.patch Normal file
View file

@ -0,0 +1,126 @@
Description: Move tests that trigger -Warray-bounds to separate compilation unit
GCC 10 is now smart enough to detect violation of array boundaries that tests
are actually tested. Along with -Werror this led to tests failure, so I move
such tests to another compilation unit to have the warning deactivated for
only these tests.
Bug-Debian: https://bugs.debian.org/966895
Author: Nicholas Guriev <guriev-ns@ya.ru>
Last-Modified: Wed, 19 Aug 2020 08:55:52 +0300
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -179,6 +179,7 @@ add_gsl_test(owner_tests)
add_gsl_test(byte_tests)
add_gsl_test(algorithm_tests)
add_gsl_test(strict_notnull_tests)
+add_gsl_test(array_bounds)
# No exception tests
--- /dev/null
+++ b/tests/array_bounds.cpp
@@ -0,0 +1,68 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2015 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUC__
+#pragma GCC diagnostic warning "-Warray-bounds"
+#endif // __GNUC__
+
+#include <gtest/gtest.h>
+
+#include <gsl/multi_span> // for gsl::multi_span
+
+namespace gsl
+{
+struct fail_fast;
+} // namespace gsl
+
+namespace
+{
+static constexpr char deathstring[] = "Expected Death";
+} // namespace
+
+TEST(array_bounds, subspan_from_multi_span_test)
+{
+ int arr[5] = {1, 2, 3, 4, 5};
+ gsl::multi_span<int> av = arr;
+
+ std::set_terminate([] {
+ std::cerr << "Expected Death. subspan";
+ std::abort();
+ });
+
+ EXPECT_DEATH(av.subspan(6).length(), deathstring);
+}
+
+TEST(array_bounds, strided_span_bounds_from_strided_span_tests)
+{
+ int arr[] = {0, 1, 2, 3};
+ gsl::multi_span<int> av(arr);
+
+ std::set_terminate([] {
+ std::cerr << "Expected Death. strided_span_bounds";
+ std::abort();
+ });
+
+ // incorrect sections
+ EXPECT_DEATH(av.section(0, 0)[0], deathstring);
+ EXPECT_DEATH(av.section(1, 0)[0], deathstring);
+ EXPECT_DEATH(av.section(1, 1)[1], deathstring);
+
+ EXPECT_DEATH(av.section(2, 5), deathstring);
+ EXPECT_DEATH(av.section(5, 2), deathstring);
+ EXPECT_DEATH(av.section(5, 0), deathstring);
+ EXPECT_DEATH(av.section(0, 5), deathstring);
+ EXPECT_DEATH(av.section(5, 5), deathstring);
+}
--- a/tests/multi_span_tests.cpp
+++ b/tests/multi_span_tests.cpp
@@ -1042,10 +1042,6 @@ TEST(multi_span_test, subspan)
EXPECT_TRUE(av.subspan(1).length() == 4);
EXPECT_TRUE(av.subspan(4).length() == 1);
EXPECT_TRUE(av.subspan(5).length() == 0);
- // Disabled test instead of fixing since multi_span is deprecated. (PR#835)
-#if !(defined(__GNUC__) && __GNUC__ == 8)
- EXPECT_DEATH(av.subspan(6).length(), deathstring);
-#endif
auto av2 = av.subspan(1);
for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2);
}
--- a/tests/strided_span_tests.cpp
+++ b/tests/strided_span_tests.cpp
@@ -403,20 +403,6 @@ TEST(strided_span_tests, strided_span_bo
});
{
- // incorrect sections
-
- EXPECT_DEATH(av.section(0, 0)[0], deathstring);
- EXPECT_DEATH(av.section(1, 0)[0], deathstring);
- EXPECT_DEATH(av.section(1, 1)[1], deathstring);
-
- EXPECT_DEATH(av.section(2, 5), deathstring);
- EXPECT_DEATH(av.section(5, 2), deathstring);
- EXPECT_DEATH(av.section(5, 0), deathstring);
- EXPECT_DEATH(av.section(0, 5), deathstring);
- EXPECT_DEATH(av.section(5, 5), deathstring);
- }
-
- {
// zero stride
strided_span<int, 1> sav{av, {{4}, {}}};
EXPECT_TRUE(sav[0] == 0);