From e4596b66710d398cbddb62499b30c147ebd4696d Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Tue, 17 Mar 2020 14:12:54 +0000 Subject: [PATCH] coroutines, testsuite: Fix single test execution. Invocations of the coro-torture.exp like 'coro-torture.exp=some-test.C' were failing because DEFAULT_CXXFLAGS was undefined. Fixed by defining this locally, if it has no pre-existing global value. --- gcc/testsuite/ChangeLog | 5 +++++ .../g++.dg/coroutines/torture/coro-torture.exp | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 15e7d6d669e..ad4fcb5fe62 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-03-17 Iain Sandoe + + * g++.dg/coroutines/torture/coro-torture.exp: Ensure that + DEFAULT_CXXFLAGS has a value, even if unset by a higher level. + 2020-03-17 Andre Vieira Mihail Ionescu Srinath Parvathaneni diff --git a/gcc/testsuite/g++.dg/coroutines/torture/coro-torture.exp b/gcc/testsuite/g++.dg/coroutines/torture/coro-torture.exp index d2463b27983..2246f7154be 100644 --- a/gcc/testsuite/g++.dg/coroutines/torture/coro-torture.exp +++ b/gcc/testsuite/g++.dg/coroutines/torture/coro-torture.exp @@ -3,13 +3,19 @@ load_lib g++-dg.exp load_lib torture-options.exp -global DG_TORTURE_OPTIONS LTO_TORTURE_OPTIONS +global DG_TORTURE_OPTIONS LTO_TORTURE_OPTIONS -dg-init -torture-init +# If a testcase doesn't have special options, use these. +global DEFAULT_CXXFLAGS +if ![info exists DEFAULT_CXXFLAGS] then { + set DEFAULT_CXXFLAGS " -pedantic-errors -Wno-long-long" +} set DEFAULT_COROFLAGS $DEFAULT_CXXFLAGS -lappend DEFAULT_COROFLAGS "-std=c++17" "-fcoroutines" +lappend DEFAULT_COROFLAGS "-fcoroutines" "-std=c++17" + +dg-init +torture-init set-torture-options [concat $DG_TORTURE_OPTIONS $LTO_TORTURE_OPTIONS] -- 2.30.2