From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4E9B0382BC02; Sat, 11 Nov 2023 00:44:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4E9B0382BC02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1699663459; bh=NGNhJdHW93As5Hc2uhrep8HQFYwlS4nQOfnzW86Hsw0=; h=From:To:Subject:Date:From; b=RMYf/LA552thSaPE49tSPNe7vTUvHQlYEVPOK0ehYsM+XkDi3k7pAEQ6QbB/VKtuT ipJHU8JXCod1kHKYeXXoHo42j6gLn21bOB+1OSMqp8Iqshk/cyTXnoruH4DAsIkxYq MHWb3yL29Ch+YE/E/Y6Erv0cEy/wP/YSCKv3ayY0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-5348] libstdc++: Fix broken tests for X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 0953497a81f1e320989b9f2aaa7f56747eddd4a0 X-Git-Newrev: 7c02efd45f5e727ab8a1b397bce8817f4ab65954 Message-Id: <20231111004419.4E9B0382BC02@sourceware.org> Date: Sat, 11 Nov 2023 00:44:19 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7c02efd45f5e727ab8a1b397bce8817f4ab65954 commit r14-5348-g7c02efd45f5e727ab8a1b397bce8817f4ab65954 Author: Jonathan Wakely Date: Mon Sep 4 15:23:23 2023 +0100 libstdc++: Fix broken tests for When I added these tests I gave them .h file extensions, so they've never been run. They need to use the no_pch option, so that they only test the header and don't get via . libstdc++-v3/ChangeLog: * testsuite/26_numerics/headers/complex.h/std_c++11.h: Moved to... * testsuite/26_numerics/headers/complex.h/std_c++11.cc: ...here. * testsuite/26_numerics/headers/complex.h/std_c++98.h: Moved to... * testsuite/26_numerics/headers/complex.h/std_c++98.cc: ...here. Check macro first and then #undef. * testsuite/26_numerics/headers/complex.h/std_gnu++11.h: Moved to... * testsuite/26_numerics/headers/complex.h/std_gnu++11.cc: ...here. Diff: --- .../headers/complex.h/{std_c++11.h => std_c++11.cc} | 4 +++- .../headers/complex.h/{std_c++98.h => std_c++98.cc} | 14 ++++++++------ .../headers/complex.h/{std_gnu++11.h => std_gnu++11.cc} | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++11.h b/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++11.cc similarity index 91% rename from libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++11.h rename to libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++11.cc index f74b13498d7..5cac1218163 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++11.h +++ b/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++11.cc @@ -15,7 +15,9 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=c++11" } +// { dg-do compile { target c++11 } } +// { dg-add-options strict_std } +// { dg-add-options no_pch } #include diff --git a/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++98.h b/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++98.cc similarity index 87% rename from libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++98.h rename to libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++98.cc index 79facef8d5b..4c9bd6e6a08 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++98.h +++ b/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_c++98.cc @@ -15,13 +15,19 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=c++98" } +// { dg-do compile { target c++98_only } } +// { dg-add-options strict_std } +// { dg-add-options no_pch } #include -// Should be equivalent to C99 , not C++ +// Should be equivalent to C99 , not C++ +#ifndef complex +# error "'complex' is not defined as a macro by for -std=c++98" +#endif namespace std { +#undef complex struct complex; } @@ -49,7 +55,3 @@ namespace test using ::creal; } #endif - -#ifndef complex -# error "'complex' is not defined as a macro by for -std=c++98" -#endif diff --git a/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_gnu++11.h b/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_gnu++11.cc similarity index 95% rename from libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_gnu++11.h rename to libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_gnu++11.cc index 20c55a5944e..4a6fc00d390 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_gnu++11.h +++ b/libstdc++-v3/testsuite/26_numerics/headers/complex.h/std_gnu++11.cc @@ -15,7 +15,8 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=gnu++11" } +// { dg-do compile { target c++11 } } +// { dg-add-options no_pch } #include