Patchwork [v3] hash vs. simulator

login
register
mail settings
Submitter Benjamin Kosnik
Date March 2, 2011, 5:17 p.m.
Message ID <20110302091738.2cf55ab1@shotwell>
Download mbox | patch
Permalink /patch/85107/
State New
Headers show

Comments

Benjamin Kosnik - March 2, 2011, 5:17 p.m.
Ooops: just realized this patch email was sitting in my queue for two
days. Here's a very minor patch-let to remove two spurious fails when
testing on a simulator.

tested x86/linux
tested arm-eabisim

Patch

2011-02-28  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/20_util/hash/chi2_quality.cc: Use C++0x mode on simulators.
	* testsuite/20_util/hash/quality.cc: Same.


diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc
index a105f4b..d626d82 100644
--- a/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc
@@ -1,6 +1,9 @@ 
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2010 Free Software Foundation, Inc.
+// Use smaller statistics when running on simulators, so it takes less time.
+// { dg-options "-std=gnu++0x -DSAMPLES=10000" { target simulator } }
+
+// Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -48,8 +51,6 @@ 
 #include <vector>
 #include <testsuite_hooks.h>
 
-// Use smaller statistics when running on simulators, so it takes less time.
-// { dg-options "-DSAMPLES=10000" { target simulator } }
 #ifndef SAMPLES
 #define SAMPLES 300000
 #endif
diff --git a/libstdc++-v3/testsuite/20_util/hash/quality.cc b/libstdc++-v3/testsuite/20_util/hash/quality.cc
index 8a6edac..0bc2637 100644
--- a/libstdc++-v3/testsuite/20_util/hash/quality.cc
+++ b/libstdc++-v3/testsuite/20_util/hash/quality.cc
@@ -1,6 +1,7 @@ 
 // { dg-options "-std=gnu++0x" }
+// { dg-options "-DNTESTS=1 -DNSTRINGS=100 -DSTRSIZE=21 -std=gnu++0x" { target simulator } }
 
-// Copyright (C) 2010 Free Software Foundation, Inc.
+// Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -26,7 +27,6 @@ 
 
 using namespace std;
 
-// { dg-options "-DNTESTS=1 -DNSTRINGS=100 -DSTRSIZE=21" { target simulator } }
 #ifndef NTESTS
 #define NTESTS 5
 #endif