diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-11-20 21:48:31 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-11-20 21:48:31 +0000 |
| commit | 9be0a9d6d20e5cb3c50f64b5a9a49070b9a0f267 (patch) | |
| tree | b5e73ec0a356065d43c6bc60f03ed116f8b5a4ba /libstdc++-v3 | |
| parent | 49e68526ab469a2a16fa63c7871b3e1afd0756be (diff) | |
| download | gcc-9be0a9d6d20e5cb3c50f64b5a9a49070b9a0f267.zip gcc-9be0a9d6d20e5cb3c50f64b5a9a49070b9a0f267.tar.gz gcc-9be0a9d6d20e5cb3c50f64b5a9a49070b9a0f267.tar.bz2 | |
Fix failing tests caused by duplicate dg-options
* testsuite/special_functions/18_riemann_zeta/check_value.cc: Fix
duplicate dg-options directive.
* testsuite/tr1/5_numerical_facilities/special_functions/
20_riemann_zeta/check_value_neg.cc: Likewise.
From-SVN: r254971
Diffstat (limited to 'libstdc++-v3')
3 files changed, 9 insertions, 20 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bdb7de2..367d40f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2017-11-20 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/special_functions/18_riemann_zeta/check_value.cc: Fix + duplicate dg-options directive. + * testsuite/tr1/5_numerical_facilities/special_functions/ + 20_riemann_zeta/check_value_neg.cc: Likewise. + 2017-11-20 Ville Voutilainen <ville.voutilainen@gmail.com> Implement LWG 2353 diff --git a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc index 8733531..4808865 100644 --- a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc +++ b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_value.cc @@ -21,7 +21,7 @@ // riemann_zeta // This can take long on simulators, timing out the test. -// { dg-options "-DMAX_ITERATIONS=5" { target simulator } } +// { dg-additional-options "-DMAX_ITERATIONS=5" { target simulator } } #ifndef MAX_ITERATIONS #define MAX_ITERATIONS (sizeof(data001) / sizeof(testcase_riemann_zeta<double>)) @@ -111,15 +111,6 @@ data001[55] = { -4.4375384158955686, 0.80000000000000071, 0.0 }, }; const double toler001 = 2.5000000000000020e-13; -// riemann_zeta - -// This can take long on simulators, timing out the test. -// { dg-options "-DMAX_ITERATIONS=5" { target simulator } } - -#ifndef MAX_ITERATIONS -#define MAX_ITERATIONS (sizeof(data001) / sizeof(testcase_riemann_zeta<double>)) -#endif - // Test data. // max(|f - f_Boost|): 8.8817841970012523e-16 at index 1 diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_value_neg.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_value_neg.cc index c8035a9..a693d39 100644 --- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_value_neg.cc +++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_value_neg.cc @@ -21,7 +21,7 @@ // riemann_zeta // This can take long on simulators, timing out the test. -// { dg-options "-DMAX_ITERATIONS=5" { target simulator } } +// { dg-additional-options "-DMAX_ITERATIONS=5" { target simulator } } #ifndef MAX_ITERATIONS #define MAX_ITERATIONS (sizeof(data001) / sizeof(testcase_riemann_zeta<double>)) @@ -111,15 +111,6 @@ data001[55] = { -4.4375384158955686, 0.80000000000000071, 0.0 }, }; const double toler001 = 2.5000000000000020e-13; -// riemann_zeta - -// This can take long on simulators, timing out the test. -// { dg-options "-DMAX_ITERATIONS=5" { target simulator } } - -#ifndef MAX_ITERATIONS -#define MAX_ITERATIONS (sizeof(data001) / sizeof(testcase_riemann_zeta<double>)) -#endif - // Test data. // max(|f - f_Boost|): 8.8817841970012523e-16 at index 1 |