From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 66FAD3858D33 for ; Mon, 4 Sep 2023 05:41:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 66FAD3858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D193D1F38C for ; Mon, 4 Sep 2023 05:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1693806105; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VbRy188XJfgaeIp11J+pINdHWi+K/hR6Y0JlUBnvc2c=; b=KEkQDP9a/0IZRu7gM21MwmR/Syv3ag7MpKNX8eFlA35vKwSawJyNFNT3lkCAY+uIo7isVW MpLNazRXIRr3+tuI+k847ypIsaTTNqwUThSXsx06+l/QLli6Wpj2E2Xox0pdSg4S3rNUZv pWWKFP+OwFm7gFd4G95/T7bBBD0BFI8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1693806105; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VbRy188XJfgaeIp11J+pINdHWi+K/hR6Y0JlUBnvc2c=; b=ASHohDEX+hanGMMNi22KTsgcOMfnBZiCKZYxah3KTkRpvGe6xEHNKJvn/hMafDtybz1FG/ 4coWbCYAOjJ+diBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BEA3613425 for ; Mon, 4 Sep 2023 05:41:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yo+BLRlu9WTjCAAAMHmgww (envelope-from ) for ; Mon, 04 Sep 2023 05:41:45 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [RFC 1/2] [gdb/testsuite] Modernize gdb.base/huge.exp Date: Mon, 4 Sep 2023 07:41:47 +0200 Message-Id: <20230904054148.24552-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Rewrite test-case gdb.base/huge.exp: - use build_executable rather than gdb_compile, - use save_vars, - factor out hardcoded loop limits min and max, - handle compilation failure using require, and - avoid using . in regexp to match $, {} and <>. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/huge.exp | 51 +++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp index e28310c6eef..fc8909db8ee 100644 --- a/gdb/testsuite/gdb.base/huge.exp +++ b/gdb/testsuite/gdb.base/huge.exp @@ -23,29 +23,44 @@ require {!target_info exists gdb,skip_huge_test} standard_testfile .c -for { set size [expr 2 * 1024 * 1024] } { $size > 10 } { set size [expr $size / 2] } { - if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ - executable [list debug "additional_flags=-DCRASH_GDB=$size"]] \ - == "" } break -} -if { $size < 10 } { - untested "size less than 10" - return -1 +set max [expr 2 * 1024 * 1024] +set min 16 + +set opts {} +lappend opts debug + +set compilation_succeeded 0 +for { set size $max } { $size >= $min } { set size [expr $size / 2] } { + set try_opts [concat $opts [list additional_flags=-DCRASH_GDB=$size]] + if { [build_executable $testfile.exp $testfile $srcfile $try_opts] == -1 } { + continue + } + + set compilation_succeeded 1 + break } +require {expr $compilation_succeeded} # Start with a fresh gdb. - clean_restart ${binfile} -set prev_timeout $timeout -set timeout 30 - -if {![runto_main]} { - return -1 -} +save_vars { timeout } { + set timeout 30 -gdb_test_no_output "set max-value-size unlimited" + if {![runto_main]} { + return -1 + } -gdb_test "print a" ".1 = .0 .repeats \[0123456789\]+ times.." "print a very large data object" + gdb_test_no_output "set max-value-size unlimited" -set timeout $prev_timeout + set re \ + [list \ + [string_to_regexp $] \ + $decimal \ + " = " \ + [string_to_regexp "{0 }"]] + set re [join $re ""] + gdb_test "print a" $re "print a very large data object" +} base-commit: 0f020d9cedc947c09717984e0182828eb5f81208 -- 2.35.3