From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 598B9386F47D for ; Tue, 15 Dec 2020 15:42:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 598B9386F47D Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-154-y7qngHpOPgilFwXvDmtpPg-1; Tue, 15 Dec 2020 10:42:23 -0500 X-MC-Unique: y7qngHpOPgilFwXvDmtpPg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DBDE2190B2A3; Tue, 15 Dec 2020 15:42:22 +0000 (UTC) Received: from localhost (unknown [10.33.36.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89FDC1E5; Tue, 15 Dec 2020 15:42:22 +0000 (UTC) Date: Tue, 15 Dec 2020 15:42:21 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Increase timeout for tests in debug mode Message-ID: <20201215154221.GA896349@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="45Z9DzgjV8m4Oswq" Content-Disposition: inline X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2020 15:42:28 -0000 --45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline These tests FAIL when testing debug mode with a small tool_timeout value. Give them a longer relative timeout. libstdc++-v3/ChangeLog: * testsuite/25_algorithms/lexicographical_compare/deque_iterators/1.cc: Add dg-timeout-factor directive. * testsuite/ext/pb_ds/regression/tree_map_rand_debug.cc: Increase timeout factor from 2.0 to 3.0. * testsuite/ext/pb_ds/regression/tree_set_rand_debug.cc: Likewise. * testsuite/lib/libstdc++.exp (check_effective_target_debug-mode): Define "debug-mode" as an effective-target keyword. Tested powerpc64le-linux (normal and debug mode). Committed to trunk. --45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit e831ad4dab9d693885a5654d49e8f219e53eaee1 Author: Jonathan Wakely Date: Tue Dec 15 15:39:58 2020 libstdc++: Increase timeout for tests in debug mode These tests FAIL when testing debug mode with a small tool_timeout value. Give them a longer relative timeout. libstdc++-v3/ChangeLog: * testsuite/25_algorithms/lexicographical_compare/deque_iterators/1.cc: Add dg-timeout-factor directive. * testsuite/ext/pb_ds/regression/tree_map_rand_debug.cc: Increase timeout factor from 2.0 to 3.0. * testsuite/ext/pb_ds/regression/tree_set_rand_debug.cc: Likewise. * testsuite/lib/libstdc++.exp (check_effective_target_debug-mode): Define "debug-mode" as an effective-target keyword. diff --git a/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/deque_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/deque_iterators/1.cc index 14a75358db4..65aafdcf03d 100644 --- a/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/deque_iterators/1.cc +++ b/libstdc++-v3/testsuite/25_algorithms/lexicographical_compare/deque_iterators/1.cc @@ -15,6 +15,8 @@ // with this library; see the file COPYING3. If not see // . +// { dg-timeout-factor 2 { target debug-mode } } + #include #include #include diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_map_rand_debug.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_map_rand_debug.cc index 627f3864347..411a906d598 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_map_rand_debug.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_map_rand_debug.cc @@ -2,7 +2,7 @@ // { dg-require-time "" } // This can take long on simulators, timing out the test. // { dg-options "-DITERATIONS=5" { target simulator } } -// { dg-timeout-factor 2.0 } +// { dg-timeout-factor 3.0 } // -*- C++ -*- diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_set_rand_debug.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_set_rand_debug.cc index cd7b1118e26..dd1b45c3491 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_set_rand_debug.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_set_rand_debug.cc @@ -2,7 +2,7 @@ // { dg-require-time "" } // This can take long on simulators, timing out the test. // { dg-options "-DITERATIONS=5" { target simulator } } -// { dg-timeout-factor 2.0 } +// { dg-timeout-factor 3.0 } // -*- C++ -*- diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 35817a8870a..aeb881f91a6 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -1004,6 +1004,11 @@ proc check_v3_target_debug_mode { } { }] } +# Define "debug-mode" as an effective-target keyword. +proc check_effective_target_debug-mode { } { + return [check_v3_target_debug_mode] +} + # Return 1 if normal mode is active, 0 otherwise. # i.e. neither Debug Mode nor Parallel Mode is active. proc check_v3_target_normal_mode { } { --45Z9DzgjV8m4Oswq--