aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2011-04-19 03:59:16 +0000
committerHans-Peter Nilsson <hp@gcc.gnu.org>2011-04-19 03:59:16 +0000
commit61bd5ad845cd20d5afcb2ce4595d276246064c77 (patch)
tree948982b6236b519e930bd8ba1143d3813c6b0c89
parente8580e831a1c5ae6c7a87e539090daa4856f59f0 (diff)
downloadgcc-61bd5ad845cd20d5afcb2ce4595d276246064c77.zip
gcc-61bd5ad845cd20d5afcb2ce4595d276246064c77.tar.gz
gcc-61bd5ad845cd20d5afcb2ce4595d276246064c77.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/20_util/hash/chi2_quality.cc5
2 files changed, 11 insertions, 0 deletions
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 <hp@axis.com>
+
+ PR testsuite/48675
+ * testsuite/20_util/hash/chi2_quality.cc (test_document_words): Stub
+ this part if SAMPLES < 100000.
+
2011-04-18 Paolo Carlini <paolo.carlini@oracle.com>
* 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