From 0e438772e788244236045d75cd2be895e2ab4e08 Mon Sep 17 00:00:00 2001 From: Lewis Hyatt Date: Thu, 22 Feb 2024 07:50:10 -0500 Subject: [PATCH] testsuite: Remove test that should not have been backported [PR105608] This test (backported as part of r13-8257, from r14-8465) was not meant to be backported, since it fails on some platforms without other GCC 14 patches that will not be backported. Remove it from the 13 branch. gcc/testsuite/ChangeLog: PR preprocessor/105608 * g++.dg/pch/line-map-3.C: Removed. * g++.dg/pch/line-map-3.Hs: Removed. --- gcc/testsuite/g++.dg/pch/line-map-3.C | 23 ----------------------- gcc/testsuite/g++.dg/pch/line-map-3.Hs | 1 - 2 files changed, 24 deletions(-) delete mode 100644 gcc/testsuite/g++.dg/pch/line-map-3.C delete mode 100644 gcc/testsuite/g++.dg/pch/line-map-3.Hs diff --git a/gcc/testsuite/g++.dg/pch/line-map-3.C b/gcc/testsuite/g++.dg/pch/line-map-3.C deleted file mode 100644 index 3390d7adba21..000000000000 --- a/gcc/testsuite/g++.dg/pch/line-map-3.C +++ /dev/null @@ -1,23 +0,0 @@ -#define UNUSED_MACRO /* { dg-error "UNUSED_MACRO" "" { xfail *-*-* } } */ -#include "line-map-3.H" /* { dg-bogus "-:UNUSED_MACRO" "" { xfail *-*-* } } */ - -/* { dg-do compile } */ -/* { dg-additional-options "-Werror=unused-macros" } */ - -/* PR preprocessor/105608 */ -/* This test case is currently xfailed and requires work in libcpp/pch.cc to - resolve. Currently, the macro location is incorrectly assigned to line 2 - of the header file when read via PCH, because libcpp doesn't try to - assign locations relative to the newly loaded line map after restoring - the PCH. */ - -/* In PCH mode we also complain incorrectly about the command line macro -Dwith_PCH - added by dejagnu; that warning would get suppressed if the macro location were - correctly restored by libcpp to reflect that it was a command line macro. */ -/* { dg-bogus "-:with_PCH" "" { xfail *-*-* } 2 } */ - -/* The reason we used -Werror was to prevent pch.exp from rerunning without PCH; - in that case we would get unnecessary XPASS outputs since the test does work - fine without PCH. Once the bug is fixed, remove the -Werror and switch to - dg-warning. */ -/* { dg-regexp {[^[:space:]]*: some warnings being treated as errors} } */ diff --git a/gcc/testsuite/g++.dg/pch/line-map-3.Hs b/gcc/testsuite/g++.dg/pch/line-map-3.Hs deleted file mode 100644 index 3b6178bfae0f..000000000000 --- a/gcc/testsuite/g++.dg/pch/line-map-3.Hs +++ /dev/null @@ -1 +0,0 @@ -/* This space intentionally left blank. */ -- 2.47.2