From patchwork Thu Aug 28 21:10:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 2577 Received: (qmail 15976 invoked by alias); 28 Aug 2014 21:10:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 15960 invoked by uid 89); 28 Aug 2014 21:10:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 28 Aug 2014 21:10:15 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7SLAEgK010042 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 28 Aug 2014 17:10:14 -0400 Received: from host2.jankratochvil.net (ovpn-113-193.phx2.redhat.com [10.3.113.193]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7SLAAGV027112 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO) for ; Thu, 28 Aug 2014 17:10:13 -0400 Date: Thu, 28 Aug 2014 23:10:10 +0200 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch] [testsuite] Fix running in-src-dir in the same directory twice Message-ID: <20140828211010.GA4960@host2.jankratochvil.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes Hi, ./configure; make; cd gdb; make check; make check -> Running ./gdb.base/argv0-symlink-dirlink/a2-run.exp ... Running ./gdb.base/argv0-symlink-dirlink/advance.exp ... Running ./gdb.base/argv0-symlink-dirlink/argv0-symlink-dirlink/a2-run.exp ... Running ./gdb.base/argv0-symlink-dirlink/argv0-symlink-dirlink/advance.exp ... Running ./gdb.base/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/argv0-symlink-dirlink/double-prompt-target-event-error.exp ... particularly I was testing it with: cp -a testsuite/ testsuite-clean;make -C testsuite/ -k -j1 check;cp -a testsuite/ testsuite-pass1;make -C testsuite/ -k -j1 check;cp -a testsuite/ testsuite-pass2 (The second run still has many FAILs due to deleted source files but that is a different patch going to be posted.) Thanks, Jan gdb/testsuite/ 2014-08-28 Jan Kratochvil Fix running in-src-dir testsuite in the same directory twice. * gdb.base/argv0-symlink.exp: Delete $dirlink. diff --git a/gdb/testsuite/gdb.base/argv0-symlink.exp b/gdb/testsuite/gdb.base/argv0-symlink.exp index d849b4c..39aab9c 100644 --- a/gdb/testsuite/gdb.base/argv0-symlink.exp +++ b/gdb/testsuite/gdb.base/argv0-symlink.exp @@ -59,6 +59,7 @@ set dirlink "${testfile}-dirlink" 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} { + remote_exec host "rm -f [standard_output_file $dirlink]" unsupported "$test (host does not support symbolic links)" return 0 } @@ -66,6 +67,7 @@ if {[lindex $status 0] != 0} { clean_restart "$dirlink/$filelink" if ![runto_main] { + remote_exec host "rm -f [standard_output_file $dirlink]" untested "could not run to main" return -1 } @@ -79,3 +81,8 @@ if ![is_remote target] { } gdb_test {print argv[0]} "/$dirlink/$filelink\"" $test gdb_test "info inferiors" "/$lastdir/$filelink *" "$test for info inferiors" + +# Stale directory symlink would deadlock runtest: +# Running ./gdb.base/argv0-symlink-dirlink/a2-run.exp ... +# Running ./gdb.base/argv0-symlink-dirlink/argv0-symlink-dirlink/a2-run.exp ... +remote_exec host "rm -f [standard_output_file $dirlink]"