On Sun, Jul 07, 2019 at 10:41:43AM +0100, Richard Sandiford wrote:
> gcc/testsuite/
> * c-c++-common/guality/Og-static-wo-1.c: New test.
> * g++.dg/guality/guality.exp: Separate the c-c++-common tests into
> "Og" and "general" tests. Run the latter at -O0 and -Og only.
Do we really want further filename prefixes based tests?
I find it extremely ugly in /vect/ and would appreciate not to add further
ones.
The tests can just use dg-skip-if, can't they?
/* { dg-skip-if "" { *-*-* } { "*" } { "-O0" "-Og" } } */
would do it.
> --- gcc/testsuite/g++.dg/guality/guality.exp 2019-07-01 10:15:31.000000000
> +0100
> +++ gcc/testsuite/g++.dg/guality/guality.exp 2019-07-07 10:29:19.999365874
> +0100
> @@ -65,8 +65,22 @@ if {[check_guality "
> return 0;
> }
> "]} {
> - gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C]] "" ""
> - gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/guality/*.c]] "" ""
> + set general [list]
> + set Og [list]
> + foreach file [lsort [glob $srcdir/c-c++-common/guality/*.c]] {
> + switch -glob -- [file tail $file] {
> + Og-* { lappend Og $file }
> + * { lappend general $file }
> + }
> + }
> +
> + gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C]] "" ""
> + gcc-dg-runtest $general "" ""
> + set-torture-options \
> + [list "-O0" "-Og"] \
> + [list {}] \
> + [list "-Og -flto"]
> + gcc-dg-runtest $Og "" ""
> }
>
> if [info exists guality_gdb_name] {
> Index: gcc/testsuite/gcc.dg/guality/guality.exp
> ===================================================================
> --- gcc/testsuite/gcc.dg/guality/guality.exp 2019-07-01 10:15:31.000000000
> +0100
> +++ gcc/testsuite/gcc.dg/guality/guality.exp 2019-07-07 10:29:19.999365874
> +0100
> @@ -80,8 +80,22 @@ if {[check_guality "
> return 0;
> }
> "]} {
> - gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "" ""
> - gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/guality/*.c]] ""
> "-Wc++-compat"
> + set general [list]
> + set Og [list]
> + foreach file [lsort [glob $srcdir/c-c++-common/guality/*.c]] {
> + switch -glob -- [file tail $file] {
> + Og-* { lappend Og $file }
> + * { lappend general $file }
> + }
> + }
> +
> + gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "" ""
> + gcc-dg-runtest $general "" "-Wc++-compat"
> + set-torture-options \
> + [list "-O0" "-Og"] \
> + [list {}] \
> + [list "-Og -flto"]
> + gcc-dg-runtest $Og "" "-Wc++-compat"
> }
>
> if [info exists guality_gdb_name] {
Jakub
