From af97728458fa973bc36fa54c55936a44dfb54bad Mon Sep 17 00:00:00 2001 From: bkoz Date: Tue, 1 Mar 2011 00:40:53 +0000 Subject: [PATCH] 2011-02-28 Benjamin Kosnik * testsuite/20_util/hash/chi2_quality.cc: Use C++0x mode on simulators. * testsuite/20_util/hash/quality.cc: Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170584 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc | 7 ++++--- libstdc++-v3/testsuite/20_util/hash/quality.cc | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 16ee7289992..a6a290959fb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2011-02-28 Benjamin Kosnik + + * testsuite/20_util/hash/chi2_quality.cc: Use C++0x mode on simulators. + * testsuite/20_util/hash/quality.cc: Same. + 2011-02-28 Paolo Carlini PR libstdc++/47921 diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc index a105f4b45d0..d626d829888 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 #include -// 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 8a6edac1687..0bc2637241f 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 -- 2.11.0