diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-07-28 22:00:34 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-07-28 22:00:34 +0100 |
| commit | c3c2f9730822a98680084e9f8b85338d3211275b (patch) | |
| tree | 34acff3bb7383b5ef9c4ec19e1502cc739f1509f | |
| parent | 2de6b254242f954dce3aace76d33a11fdbe8f894 (diff) | |
| download | gcc-c3c2f9730822a98680084e9f8b85338d3211275b.zip gcc-c3c2f9730822a98680084e9f8b85338d3211275b.tar.gz gcc-c3c2f9730822a98680084e9f8b85338d3211275b.tar.bz2 | |
Use dg-additional-options in libstdc++ tests
* testsuite/17_intro/headers/c++2011/stdc++.cc: Change target-specific
dg-options to dg-additional-options so that default options are used.
* testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc:
Likewise.
* testsuite/17_intro/headers/c++2014/stdc++.cc: Likewise.
* testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc:
Likewise.
* testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc:
Use dg-additional-options instead of repeating the common options.
From-SVN: r238835
6 files changed, 15 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fad941b..3afe2bf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,15 @@ 2016-07-28 Jonathan Wakely <jwakely@redhat.com> + * testsuite/17_intro/headers/c++2011/stdc++.cc: Change target-specific + dg-options to dg-additional-options so that default options are used. + * testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc: + Likewise. + * testsuite/17_intro/headers/c++2014/stdc++.cc: Likewise. + * testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc: + Likewise. + * testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc: + Use dg-additional-options instead of repeating the common options. + * testsuite/22_locale/conversions/string/1.cc: Remove unintended dg-do compile directive. * testsuite/26_numerics/headers/cmath/fabs_inline.cc: Fix syntax of diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++.cc index 26a0e42..40bced7 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++.cc @@ -1,6 +1,6 @@ // FreeBSD wants warning clean system headers: -// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } } // { dg-options "-std=gnu++11" } +// { dg-additional-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } } // { dg-do compile } // Copyright (C) 2007-2016 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc index 69869b7..59f7748 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc @@ -1,6 +1,6 @@ // FreeBSD wants warning clean system headers: -// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } } // { dg-options "-std=gnu++11" } +// { dg-additional-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } } // { dg-do compile } // Copyright (C) 2007-2016 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++.cc index 2ab83c7..cd74e7b 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++.cc @@ -1,6 +1,6 @@ // FreeBSD wants warning clean system headers: -// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } } // { dg-options "-std=gnu++14" } +// { dg-additional-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } } // { dg-do compile } // Copyright (C) 2015-2016 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc index 7303143..3805723 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/stdc++_multiple_inclusion.cc @@ -1,6 +1,6 @@ // FreeBSD wants warning clean system headers: -// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } } // { dg-options "-std=gnu++14" } +// { dg-additional-options "-Wall -Wsystem-headers" { target *-*-freebsd* *-*-dragonfly* } } // { dg-do compile } // Copyright (C) 2015-2016 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc index 560eee3..f4a88f6 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc @@ -1,6 +1,6 @@ // { dg-do compile { target i?86-*-* x86_64-*-* } } // { dg-options "-std=gnu++11 -g0 -fno-exceptions -fno-asynchronous-unwind-tables" } -// { dg-options "-std=gnu++11 -g0 -fno-exceptions -fno-asynchronous-unwind-tables -march=i486" { target ia32 } } +// { dg-additional-options "-march=i486" { target ia32 } } // { dg-final { scan-assembler-times "xacquire\|\.byte\[^\n\r]*0xf2" 14 } } // { dg-final { scan-assembler-times "xrelease\|\.byte\[^\n\r]*0xf3" 14 } } |