From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id RdhVKHRm1GD3GAAAWB0awg (envelope-from ) for ; Thu, 24 Jun 2021 07:03:16 -0400 Received: by simark.ca (Postfix, from userid 112) id 88FD01F1F2; Thu, 24 Jun 2021 07:03:16 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id EF67A1E939 for ; Thu, 24 Jun 2021 07:03:14 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 624D53AA9827 for ; Thu, 24 Jun 2021 11:03:14 +0000 (GMT) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 35C2A3890018 for ; Thu, 24 Jun 2021 11:03:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 35C2A3890018 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 487811FD40 for ; Thu, 24 Jun 2021 11:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1624532582; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=8NLgJ9rKMIn0IhXGx6emZVSJ9y5Op8SA8ZPonm3gJo8=; b=jfFLTv9ZTy8ITLIdDnlXej5nkQ2wYEBXB0VV9n+ieIR5D5ovd2SF1+VpM8AzxfY4lrU9kV OH3RmFsDP30ZXeLcDWPFKwUtnq9cpDaOE95vI561fehunKMWIWaUH+fw9KXUvycl0ccA65 U1Nur0Kn1WKy5eExt3IqejfhVhjWvwk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1624532582; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=8NLgJ9rKMIn0IhXGx6emZVSJ9y5Op8SA8ZPonm3gJo8=; b=X8BBL6PuxvtgBqwHx0cFPYMsKe/kr9O81VX1vtyZsCuYKcn/RUVBLPmGq7ddzcc9CmAEg8 Yiljjw7FW9I96sAA== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id 2AB9E11A97 for ; Thu, 24 Jun 2021 11:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1624532582; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=8NLgJ9rKMIn0IhXGx6emZVSJ9y5Op8SA8ZPonm3gJo8=; b=jfFLTv9ZTy8ITLIdDnlXej5nkQ2wYEBXB0VV9n+ieIR5D5ovd2SF1+VpM8AzxfY4lrU9kV OH3RmFsDP30ZXeLcDWPFKwUtnq9cpDaOE95vI561fehunKMWIWaUH+fw9KXUvycl0ccA65 U1Nur0Kn1WKy5eExt3IqejfhVhjWvwk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1624532582; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=8NLgJ9rKMIn0IhXGx6emZVSJ9y5Op8SA8ZPonm3gJo8=; b=X8BBL6PuxvtgBqwHx0cFPYMsKe/kr9O81VX1vtyZsCuYKcn/RUVBLPmGq7ddzcc9CmAEg8 Yiljjw7FW9I96sAA== Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id bdxrCWZm1GCmdQAALh3uQQ (envelope-from ) for ; Thu, 24 Jun 2021 11:03:02 +0000 Date: Thu, 24 Jun 2021 13:03:00 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix duplicate in gdb.base/argv0-symlink.exp Message-ID: <20210624110259.GA22199@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, I found the following duplicates in gdb.base/argv0-symlink.exp: ... DUPLICATE: gdb.base/argv0-symlink.exp: set print repeats 10000 DUPLICATE: gdb.base/argv0-symlink.exp: set print elements 10000 ... Fix these by using with_test_prefix "file symlink" / "dir symlink". Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix duplicate in gdb.base/argv0-symlink.exp gdb/testsuite/ChangeLog: 2021-06-24 Tom de Vries * gdb.base/argv0-symlink.exp: Use with_test_prefix. --- gdb/testsuite/ChangeLog | 4 ++ gdb/testsuite/gdb.base/argv0-symlink.exp | 119 +++++++++++++++++-------------- 2 files changed, 68 insertions(+), 55 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a790e6856ae..73035a906da 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2021-06-24 Tom de Vries + + * gdb.base/argv0-symlink.exp: Use with_test_prefix. + 2021-06-23 Tom de Vries * lib/gdb.exp (gdb_test_lines): Rewrite to accept single diff --git a/gdb/testsuite/gdb.base/argv0-symlink.exp b/gdb/testsuite/gdb.base/argv0-symlink.exp index f39f75c8d7c..f55d9861603 100644 --- a/gdb/testsuite/gdb.base/argv0-symlink.exp +++ b/gdb/testsuite/gdb.base/argv0-symlink.exp @@ -38,73 +38,82 @@ if { [build_executable ${testfile}.exp ${testfile} ${srcfile}] == -1 } { return -1 } -set test "kept file symbolic link name" -set filelink "${testfile}-filelink" - -remote_file host delete [standard_output_file $filelink] -set status [remote_exec host "ln -sf ${testfile} [standard_output_file $filelink]"] -if {[lindex $status 0] != 0} { - unsupported "$test (host does not support symbolic links)" - return 0 -} - -clean_restart "$filelink" +with_test_prefix "file symlink" { -if ![runto_main] { - untested "could not run to main" - return -1 -} + set test "kept name" + set filelink "${testfile}-filelink" -gdb_test_no_output "set print repeats 10000" -gdb_test_no_output "set print elements 10000" + remote_file host delete [standard_output_file $filelink] + set status [remote_exec host \ + "ln -sf ${testfile} [standard_output_file $filelink]"] + if {[lindex $status 0] != 0} { + unsupported "$test (host does not support symbolic links)" + return 0 + } -if { $has_argv0 } { - gdb_test {print argv[0]} "/$filelink\"" $test -} else { - unsupported $test -} + clean_restart "$filelink" -# For a link named /PATH/TO/DIR/LINK, we want to check the output -# against "/DIR/LINK", but computed in a way that doesn't make -# assumptions about the test directory layout. -set full_filelink [standard_output_file $filelink] -set lastdir [file tail [file dirname $full_filelink]] + if ![runto_main] { + untested "could not run to main" + return -1 + } -gdb_test "info inferiors" "/$lastdir/$filelink *" "$test for info inferiors" + gdb_test_no_output "set print repeats 10000" + gdb_test_no_output "set print elements 10000" + if { $has_argv0 } { + gdb_test {print argv[0]} "/$filelink\"" $test + } else { + unsupported $test + } -set test "kept directory symbolic link name" -set dirlink "${testfile}-dirlink" + # For a link named /PATH/TO/DIR/LINK, we want to check the output + # against "/DIR/LINK", but computed in a way that doesn't make + # assumptions about the test directory layout. + set full_filelink [standard_output_file $filelink] + set lastdir [file tail [file dirname $full_filelink]] -# 'ln -sf' does not overwrite symbol link to a directory. -# 'remote_file host delete' uses stat (not lstat), therefore it refuses to -# delete a directory. -remote_exec host "rm -f [standard_output_file $dirlink]" -set status [remote_exec host "ln -sf . [standard_output_file $dirlink]"] -if {[lindex $status 0] != 0} { - unsupported "$test (host does not support symbolic links)" - return 0 + gdb_test "info inferiors" "/$lastdir/$filelink *" \ + "$test for info inferiors" } -clean_restart "$dirlink/$filelink" +with_test_prefix "dir symlink" { -if ![runto_main] { - untested "could not run to main" - return -1 -} + set test "kept name" + set dirlink "${testfile}-dirlink" + + # 'ln -sf' does not overwrite symbol link to a directory. + # 'remote_file host delete' uses stat (not lstat), therefore it refuses to + # delete a directory. + remote_exec host "rm -f [standard_output_file $dirlink]" + set status [remote_exec host "ln -sf . [standard_output_file $dirlink]"] + if {[lindex $status 0] != 0} { + unsupported "$test (host does not support symbolic links)" + return 0 + } -gdb_test_no_output "set print repeats 10000" -gdb_test_no_output "set print elements 10000" + clean_restart "$dirlink/$filelink" -if { $has_argv0 } { - # gdbserver in extended-remote mode does not have this issue. - # Plain remote does, however. - if {[target_info gdb_protocol] != "extended-remote" || ![target_is_gdbserver]} { - setup_kfail "*-*-*" gdb/15934 + if ![runto_main] { + untested "could not run to main" + return -1 + } + + gdb_test_no_output "set print repeats 10000" + gdb_test_no_output "set print elements 10000" + + if { $has_argv0 } { + # gdbserver in extended-remote mode does not have this issue. + # Plain remote does, however. + if { [target_info gdb_protocol] != "extended-remote" + || ![target_is_gdbserver] } { + setup_kfail "*-*-*" gdb/15934 + } + gdb_test {print argv[0]} "/$dirlink/$filelink\"" $test + } else { + unsupported $test } - gdb_test {print argv[0]} "/$dirlink/$filelink\"" $test -} else { - unsupported $test -} -gdb_test "info inferiors" "/$lastdir/$filelink *" "$test for info inferiors" + gdb_test "info inferiors" "/$lastdir/$filelink *" \ + "$test for info inferiors" +}