From 4a069073834c5b710e17315c0844f1212fa54164 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 10 May 2023 09:17:47 +0200 Subject: [PATCH] Testsuite: Add 'torture-init-done', and use it to conditionalize implicit 'torture-init' Recent commit d6654a4be3ba44c0d57be7c8a51d76d9721345e1 "Let each 'lto_init' determine the default 'LTO_OPTIONS', and 'torture-init' the 'LTO_TORTURE_OPTIONS'" made 'torture-init' non-idempotent re 'LTO_TORTURE_OPTIONS', in order to catch certain classes of errors. Now, most of all '*.exp' files have 'torture-init' followed by 'set-torture-options' before 'gcc-dg-runtest' etc., and therefore don't run into the latter's "Some callers set torture options themselves; don't override those." code. Some '*.exp' files however do 'torture-init' but not 'set-torture-options', and therefore we can't any longer conditionalize the implicit 'torture-init' by '![torture-options-exist]'. gcc/testsuite/ * lib/torture-options.exp (torture-init-done): Add. * lib/gcc-dg.exp (gcc-dg-runtest): Use it to conditionalize implicit 'torture-init'. * lib/gfortran-dg.exp (gfortran-dg-runtest): Likewise. * lib/obj-c++-dg.exp (obj-c++-dg-runtest): Likewise. * lib/objc-dg.exp (objc-dg-runtest): Likewise. --- gcc/testsuite/lib/gcc-dg.exp | 8 ++++++-- gcc/testsuite/lib/gfortran-dg.exp | 8 ++++++-- gcc/testsuite/lib/obj-c++-dg.exp | 8 ++++++-- gcc/testsuite/lib/objc-dg.exp | 8 ++++++-- gcc/testsuite/lib/torture-options.exp | 6 ++++++ 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 693cbdd7511..4ed4233efff 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -568,11 +568,15 @@ proc search_for { file pattern } { proc gcc-dg-runtest { testcases flags default-extra-flags } { global runtests + # Some callers initialize torture testing themselves; don't override those. + set existing_torture_init [torture-init-done] + if { $existing_torture_init == 0 } { + torture-init + } # Some callers set torture options themselves; don't override those. set existing_torture_options [torture-options-exist] if { $existing_torture_options == 0 } { global DG_TORTURE_OPTIONS LTO_TORTURE_OPTIONS - torture-init set-torture-options $DG_TORTURE_OPTIONS [list {}] $LTO_TORTURE_OPTIONS } dump-torture-options @@ -603,7 +607,7 @@ proc gcc-dg-runtest { testcases flags default-extra-flags } { } } - if { $existing_torture_options == 0 } { + if { $existing_torture_init == 0 } { torture-finish } } diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp index 3c813d3c8fb..e85f791fa94 100644 --- a/gcc/testsuite/lib/gfortran-dg.exp +++ b/gcc/testsuite/lib/gfortran-dg.exp @@ -126,11 +126,15 @@ proc gfortran-dg-runtest { testcases flags default-extra-flags } { global runtests global torture_with_loops + # Some callers initialize torture testing themselves; don't override those. + set existing_torture_init [torture-init-done] + if { $existing_torture_init == 0 } { + torture-init + } # Some callers set torture options themselves; don't override those. set existing_torture_options [torture-options-exist] if { $existing_torture_options == 0 } { global DG_TORTURE_OPTIONS - torture-init set-torture-options $DG_TORTURE_OPTIONS } dump-torture-options @@ -160,7 +164,7 @@ proc gfortran-dg-runtest { testcases flags default-extra-flags } { } } - if { $existing_torture_options == 0 } { + if { $existing_torture_init == 0 } { torture-finish } } diff --git a/gcc/testsuite/lib/obj-c++-dg.exp b/gcc/testsuite/lib/obj-c++-dg.exp index 9123240f033..8deaed005dc 100644 --- a/gcc/testsuite/lib/obj-c++-dg.exp +++ b/gcc/testsuite/lib/obj-c++-dg.exp @@ -32,11 +32,15 @@ proc obj-c++-dg-prune { system text } { proc obj-c++-dg-runtest { testcases flags default-extra-flags } { global runtests + # Some callers initialize torture testing themselves; don't override those. + set existing_torture_init [torture-init-done] + if { $existing_torture_init == 0 } { + torture-init + } # Some callers set torture options themselves; don't override those. set existing_torture_options [torture-options-exist] if { $existing_torture_options == 0 } { global DG_TORTURE_OPTIONS LTO_TORTURE_OPTIONS - torture-init set-torture-options $DG_TORTURE_OPTIONS [list {}] $LTO_TORTURE_OPTIONS } dump-torture-options @@ -67,7 +71,7 @@ proc obj-c++-dg-runtest { testcases flags default-extra-flags } { } } - if { $existing_torture_options == 0 } { + if { $existing_torture_init == 0 } { torture-finish } } \ No newline at end of file diff --git a/gcc/testsuite/lib/objc-dg.exp b/gcc/testsuite/lib/objc-dg.exp index 9ca751c8f48..cf08cdcabbd 100644 --- a/gcc/testsuite/lib/objc-dg.exp +++ b/gcc/testsuite/lib/objc-dg.exp @@ -33,11 +33,15 @@ proc objc-dg-prune { system text } { proc objc-dg-runtest { testcases flags default-extra-flags } { global runtests + # Some callers initialize torture testing themselves; don't override those. + set existing_torture_init [torture-init-done] + if { $existing_torture_init == 0 } { + torture-init + } # Some callers set torture options themselves; don't override those. set existing_torture_options [torture-options-exist] if { $existing_torture_options == 0 } { global DG_TORTURE_OPTIONS LTO_TORTURE_OPTIONS - torture-init set-torture-options $DG_TORTURE_OPTIONS [list {}] $LTO_TORTURE_OPTIONS } dump-torture-options @@ -68,7 +72,7 @@ proc objc-dg-runtest { testcases flags default-extra-flags } { } } - if { $existing_torture_options == 0 } { + if { $existing_torture_init == 0 } { torture-finish } } diff --git a/gcc/testsuite/lib/torture-options.exp b/gcc/testsuite/lib/torture-options.exp index 394418e9a02..d00d07e9378 100644 --- a/gcc/testsuite/lib/torture-options.exp +++ b/gcc/testsuite/lib/torture-options.exp @@ -51,6 +51,12 @@ proc torture-init { args } { } } +# Return 1 if 'torture-init' has already been done, 0 otherwise. +proc torture-init-done { args } { + global LTO_TORTURE_OPTIONS + return [info exists LTO_TORTURE_OPTIONS] +} + # Return 1 if torture options have already been set, 0 otherwise. proc torture-options-exist { args } { global torture_with_loops -- 2.34.1