From 32657045bd28f7d35c9b814d8b338c21e4f5dc40 Mon Sep 17 00:00:00 2001 From: Rimvydas Jasinskas Date: Tue, 18 Jan 2022 06:12:45 +0000 Subject: [PATCH] Add XFAIL parts of pr16855.C for dragonfly. On DragonFly BSD profiling ends before these DTORs are invoked on dso cleanup. The -static compilation works as expected. gcc/testsuite/ChangeLog: PR testsuite/104022 * g++.dg/gcov/pr16855.C: xfail the count lines for DTORs on dragonfly. * g++.dg/gcov/pr16855-priority.C: Ditto. Adjust source layout so that dejagnu xfail expressions work. Signed-off-by: Rimvydas Jasinskas --- gcc/testsuite/g++.dg/gcov/pr16855-priority.C | 6 ++++-- gcc/testsuite/g++.dg/gcov/pr16855.C | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/g++.dg/gcov/pr16855-priority.C b/gcc/testsuite/g++.dg/gcov/pr16855-priority.C index 7e395652a631..c7a58397bb91 100644 --- a/gcc/testsuite/g++.dg/gcov/pr16855-priority.C +++ b/gcc/testsuite/g++.dg/gcov/pr16855-priority.C @@ -19,7 +19,9 @@ class Test { public: Test (void) { fprintf (stderr, "In Test::Test\n"); /* count(1) */ } - ~Test (void) { fprintf (stderr, "In Test::~Test\n"); /* count(1) */ } + ~Test (void) { + fprintf (stderr, "In Test::~Test\n"); /* count(1) { xfail *-*-dragonfly* } */ + } } T1; void @@ -76,4 +78,4 @@ static void __attribute__ ((destructor ((65535)))) dtor_65535 () fprintf (stderr, "in destructor((65535))\n"); /* count(1) */ } -/* { dg-final { run-gcov branches { -b pr16855-priority.C } } } */ +/* { dg-final { run-gcov branches { -b pr16855-priority.C } { xfail *-*-dragonfly* } } } */ diff --git a/gcc/testsuite/g++.dg/gcov/pr16855.C b/gcc/testsuite/g++.dg/gcov/pr16855.C index a68b05cb571c..f9b86a40001f 100644 --- a/gcc/testsuite/g++.dg/gcov/pr16855.C +++ b/gcc/testsuite/g++.dg/gcov/pr16855.C @@ -21,7 +21,7 @@ class Test public: Test (void) { fprintf (stderr, "In Test::Test\n"); /* count(1) */ } ~Test (void) { - fprintf (stderr, "In Test::~Test\n"); /* count(1) { xfail *-*-darwin* } */ + fprintf (stderr, "In Test::~Test\n"); /* count(1) { xfail *-*-darwin* *-*-dragonfly* } */ } } T1; @@ -49,4 +49,4 @@ static void __attribute__ ((destructor)) dtor_default () fprintf (stderr, "in destructor(())\n"); /* count(1) { xfail *-*-darwin* } */ } -/* { dg-final { run-gcov branches { -b pr16855.C } { xfail *-*-darwin* } } } */ +/* { dg-final { run-gcov branches { -b pr16855.C } { xfail *-*-darwin* *-*-dragonfly* } } } */ -- 2.47.2