From 61bd5ad845cd20d5afcb2ce4595d276246064c77 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Tue, 19 Apr 2011 03:59:16 +0000 Subject: [PATCH] re PR testsuite/48675 (20_util/hash/chi2_quality.cc timeout) PR testsuite/48675 * testsuite/20_util/hash/chi2_quality.cc (test_document_words): Stub this part if SAMPLES < 100000. From-SVN: r172692 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6eaa026..643e4f2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2011-04-19 Hans-Peter Nilsson + + PR testsuite/48675 + * testsuite/20_util/hash/chi2_quality.cc (test_document_words): Stub + this part if SAMPLES < 100000. + 2011-04-18 Paolo Carlini * include/std/type_traits (is_nothrow_default_constructible, diff --git a/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc b/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc index d626d82..8a38834 100644 --- a/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc +++ b/libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc @@ -183,6 +183,10 @@ test_bit_string_set() void test_document_words() { + // That file is 187587 single-word lines. To avoid a timeout, just skip + // this part, which would take up to 95% of the program runtime (with + // SAMPLES == 10000), if we're not supposed to run anywhere that long. +#if SAMPLES >= 100000 bool test __attribute__((unused)) = true; const std::string f_name = "thirty_years_among_the_dead_preproc.txt"; std::ifstream in(f_name); @@ -199,6 +203,7 @@ test_document_words() const unsigned long k = words.size() / 20; double chi2 = chi2_hash(words, k); VERIFY( chi2 < k*1.1 ); +#endif } int -- 2.7.4