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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bdb7de2fe8ea2ca66bc359fe6a79941789a6008a..367d40f1a2d8b31b439f92183cec4a243a399224 100644 (file)
--- 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 8733531f8b20ce895f97241bb604087161c60e60..48088653d161a117fa133fa26d5d19a618fd48ed 100644 (file)
--- 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 c8035a9c012b7f8cb6ef516b2e5a32d652f31d2e..a693d394624f7e270fb4b229a2465293bf7a8ead 100644 (file)
--- 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