From 218cedd5a36ae1cdd08c5ff997027d44ef4b6542 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 26 Nov 2020 15:16:25 +0000 Subject: [PATCH] libstdc++: Set dg-timeout-factor for some slow tests These tests are very, very slow to compile. If the testsuite is run with a low tool_timeout value they are likely to fail. By adding a multiplication factor to those tests, it's still possible to use a low timeout without spurious failures. libstdc++-v3/ChangeLog: * testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc: Add dg-timeout-factor directive. * testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc: Likewise. * testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc: Likewise. * testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc: Likewise. * testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc: Likewise. * testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc: Likewise. * testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc: Likewise. * testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc: Likewise. * testsuite/28_regex/algorithms/regex_search/61720.cc: Likewise. * testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc: Likewise. * testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc: Likewise. * testsuite/28_regex/basic_regex/ctors/deduction.cc: Likewise. --- .../algorithms/regex_match/basic/string_range_01_03.cc | 3 ++- .../28_regex/algorithms/regex_match/cstring_bracket_01.cc | 1 + .../28_regex/algorithms/regex_match/ecma/char/backref.cc | 1 + .../28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc | 1 + .../28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc | 1 + .../28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc | 1 + .../28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc | 1 + .../28_regex/algorithms/regex_match/extended/wstring_locale.cc | 1 + .../testsuite/28_regex/algorithms/regex_search/61720.cc | 1 + .../28_regex/algorithms/regex_search/ecma/assertion.cc | 1 + .../28_regex/algorithms/regex_search/ecma/string_01.cc | 1 + libstdc++-v3/testsuite/28_regex/basic_regex/ctors/deduction.cc | 1 + 12 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc index f787f57c1ff..0809716f61d 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 2 } // // 2010-06-16 Stephen M. Webb @@ -55,7 +56,7 @@ test01() int main() -{ +{ test01(); return 0; } diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc index fe076c707c3..6bf6a7737b7 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/cstring_bracket_01.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 2 } // // 2013-08-01 Tim Shen diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc index ac08a7dff0d..8fb320f811e 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/backref.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 2 } // // 2013-09-02 Tim Shen diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc index 1ea076e97b7..e2b906d467b 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 3 } // // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc index 590a5d3c97e..49444c476fe 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 3 } // // 2013-09-02 Tim Shen diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc index 81ee616b211..58fdd6e12a3 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/cjk_match.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 3 } // // 2013-10-18 Tim Shen diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc index 765bfff072d..b8e94efa7b0 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 2 } // // 2013-09-02 Tim Shen diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc index 483a4a6f724..33867e5057a 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc @@ -1,5 +1,6 @@ // { dg-do run { target c++11 } } // { dg-require-namedlocale "de_DE.UTF-8" } +// { dg-timeout-factor 3 } // // 2013-08-29 Tim Shen diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc index f4126fe3fca..169527b1699 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/61720.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 2 } // // Copyright (C) 2014-2020 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc index ab80804a7fe..bf4207e60b1 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 2 } // // 2013-09-14 Tim Shen diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc index 456b8763b7c..f69e6a6e98c 100644 --- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc +++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-timeout-factor 2 } // // 2013-08-26 Tim Shen diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/deduction.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/deduction.cc index 6fab70c0ff5..88112af3d4a 100644 --- a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/deduction.cc +++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/deduction.cc @@ -17,6 +17,7 @@ // { dg-options "-std=gnu++17" } // { dg-do compile { target c++17 } } +// { dg-timeout-factor 3 } #include #include -- 2.30.2