From 955fe731e3c1784b56209006576bc4263b854b9f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 18 Oct 2018 21:04:55 +0100 Subject: [PATCH] Fix tests that fail when built with different options * testsuite/20_util/duration/cons/2.cc: Add -ffloat-store to fix failure when compiled without optimisation. * testsuite/ext/profile/mutex_extensions_neg.cc: Prune additional errors caused by C++17 std::pmr alias templates. From-SVN: r265287 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/20_util/duration/cons/2.cc | 1 + libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc | 2 ++ 3 files changed, 8 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b26e1fcfd29..5edbec9d36c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2018-10-18 Jonathan Wakely + * testsuite/20_util/duration/cons/2.cc: Add -ffloat-store to fix + failure when compiled without optimisation. + * testsuite/ext/profile/mutex_extensions_neg.cc: Prune additional + errors caused by C++17 std::pmr alias templates. + PR libstdc++/87642 * config/locale/gnu/monetary_members.cc (moneypunct::_M_initialize_moneypunct): Use diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/2.cc b/libstdc++-v3/testsuite/20_util/duration/cons/2.cc index 3f48f25f101..65b151f8b20 100644 --- a/libstdc++-v3/testsuite/20_util/duration/cons/2.cc +++ b/libstdc++-v3/testsuite/20_util/duration/cons/2.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-additional-options "-ffloat-store" { target { m68*-*-* || ia32 } } } // Copyright (C) 2008-2018 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc index 147d56740a1..69cc1115b80 100644 --- a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc +++ b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc @@ -29,3 +29,5 @@ // "template argument 1 is invalid" // { dg-prune-output "tuple:993" } +// PMR alias templates cause ambiguities between debug and profile containers: +// { dg-prune-output "is ambiguous" } -- 2.30.2