From 9d9c1430c569e661913a3f5dc59fceaa03cc935d Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 14 Jun 2023 22:39:01 +0200 Subject: [PATCH] Skip a number of C++ 'g++.dg/tree-prof/' test cases for '-fno-exceptions' testing Running 'make check' with: 'RUNTESTFLAGS=--target_board=unix/-fno-exceptions', 'error: exception handling disabled' is triggered for C++ 'throw' etc. usage, and per 'gcc/testsuite/lib/gcc-dg.exp:gcc-dg-prune': # If exceptions are disabled, mark tests expecting exceptions to be enabled # as unsupported. if { ![check_effective_target_exceptions_enabled] } { if [regexp "(^|\n)\[^\n\]*: error: exception handling disabled" $text] { return "::unsupported::exception handling disabled" } ..., which generally means: -PASS: [...] (test for excess errors) +UNSUPPORTED: [...]: exception handling disabled However, this doesn't work for 'g++.dg/tree-prof/' test cases. For example: [-PASS: g++.dg/tree-prof/indir-call-prof-2.C compilation, -fprofile-generate -D_PROFILE_GENERATE-] [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-prof/indir-call-prof-2.C compilation, -fprofile-use -D_PROFILE_USE [-PASS:-]{+UNSUPPORTED: g++.dg/tree-prof/indir-call-prof-2.C compilation: exception handling disabled+} {+UNRESOLVED:+} g++.dg/tree-prof/indir-call-prof-2.C execution, -fprofile-generate -D_PROFILE_GENERATE [-PASS:-]{+UNRESOLVED:+} g++.dg/tree-prof/indir-call-prof-2.C execution, -fprofile-use -D_PROFILE_USE Dependent parts turn UNRESOLVED if "compilation" runs into the expected 'UNSUPPORTED: [...] compile: exception handling disabled'. Specify 'dg-require-effective-target exceptions_enabled' for those test cases. gcc/testsuite/ * g++.dg/tree-prof/indir-call-prof-2.C: Specify 'dg-require-effective-target exceptions_enabled'. * g++.dg/tree-prof/partition1.C: Likewise. * g++.dg/tree-prof/partition2.C: Likewise. * g++.dg/tree-prof/partition3.C: Likewise. * g++.dg/tree-prof/pr51719.C: Likewise. * g++.dg/tree-prof/pr57451.C: Likewise. * g++.dg/tree-prof/pr59255.C: Likewise. --- gcc/testsuite/g++.dg/tree-prof/indir-call-prof-2.C | 1 + gcc/testsuite/g++.dg/tree-prof/partition1.C | 1 + gcc/testsuite/g++.dg/tree-prof/partition2.C | 1 + gcc/testsuite/g++.dg/tree-prof/partition3.C | 1 + gcc/testsuite/g++.dg/tree-prof/pr51719.C | 1 + gcc/testsuite/g++.dg/tree-prof/pr57451.C | 1 + gcc/testsuite/g++.dg/tree-prof/pr59255.C | 1 + 7 files changed, 7 insertions(+) diff --git a/gcc/testsuite/g++.dg/tree-prof/indir-call-prof-2.C b/gcc/testsuite/g++.dg/tree-prof/indir-call-prof-2.C index e20cc64d373..497282db376 100644 --- a/gcc/testsuite/g++.dg/tree-prof/indir-call-prof-2.C +++ b/gcc/testsuite/g++.dg/tree-prof/indir-call-prof-2.C @@ -1,3 +1,4 @@ +/* { dg-require-effective-target exceptions_enabled } */ /* { dg-options "-O" } */ int foo1(void) { return 0; } diff --git a/gcc/testsuite/g++.dg/tree-prof/partition1.C b/gcc/testsuite/g++.dg/tree-prof/partition1.C index d0dcbc4524b..a7c9cd5ba7f 100644 --- a/gcc/testsuite/g++.dg/tree-prof/partition1.C +++ b/gcc/testsuite/g++.dg/tree-prof/partition1.C @@ -1,3 +1,4 @@ +/* { dg-require-effective-target exceptions_enabled } */ /* { dg-require-effective-target freorder } */ /* { dg-options "-O2 -freorder-blocks-and-partition" } */ diff --git a/gcc/testsuite/g++.dg/tree-prof/partition2.C b/gcc/testsuite/g++.dg/tree-prof/partition2.C index 0bc50fae98a..512c1274140 100644 --- a/gcc/testsuite/g++.dg/tree-prof/partition2.C +++ b/gcc/testsuite/g++.dg/tree-prof/partition2.C @@ -1,4 +1,5 @@ // PR middle-end/45458 +/* { dg-require-effective-target exceptions_enabled } */ // { dg-require-effective-target freorder } // { dg-options "-O2 -fnon-call-exceptions -freorder-blocks-and-partition" } diff --git a/gcc/testsuite/g++.dg/tree-prof/partition3.C b/gcc/testsuite/g++.dg/tree-prof/partition3.C index c62174aa4d3..48a850ddfae 100644 --- a/gcc/testsuite/g++.dg/tree-prof/partition3.C +++ b/gcc/testsuite/g++.dg/tree-prof/partition3.C @@ -1,4 +1,5 @@ // PR middle-end/45566 +// { dg-require-effective-target exceptions_enabled } // { dg-require-effective-target freorder } // { dg-options "-O2 -fnon-call-exceptions -freorder-blocks-and-partition" } diff --git a/gcc/testsuite/g++.dg/tree-prof/pr51719.C b/gcc/testsuite/g++.dg/tree-prof/pr51719.C index 01e81ff66ed..7c568eb537f 100644 --- a/gcc/testsuite/g++.dg/tree-prof/pr51719.C +++ b/gcc/testsuite/g++.dg/tree-prof/pr51719.C @@ -1,4 +1,5 @@ // PR tree-optimization/51719 +// { dg-require-effective-target exceptions_enabled } // { dg-options "-O -fpartial-inlining" } int diff --git a/gcc/testsuite/g++.dg/tree-prof/pr57451.C b/gcc/testsuite/g++.dg/tree-prof/pr57451.C index db0fcc1e8ef..a530e9053e2 100644 --- a/gcc/testsuite/g++.dg/tree-prof/pr57451.C +++ b/gcc/testsuite/g++.dg/tree-prof/pr57451.C @@ -1,3 +1,4 @@ +// { dg-require-effective-target exceptions_enabled } // { dg-require-effective-target freorder } // { dg-options "-O2 -freorder-blocks-and-partition -g" } diff --git a/gcc/testsuite/g++.dg/tree-prof/pr59255.C b/gcc/testsuite/g++.dg/tree-prof/pr59255.C index 77f208a3a5f..a5ee03c2cca 100644 --- a/gcc/testsuite/g++.dg/tree-prof/pr59255.C +++ b/gcc/testsuite/g++.dg/tree-prof/pr59255.C @@ -1,4 +1,5 @@ // PR c++/59255 +// { dg-require-effective-target exceptions_enabled } // { dg-options "-std=c++11 -O2" } struct S -- 2.34.1