From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16309 invoked by alias); 29 Mar 2010 16:18:51 -0000 Received: (qmail 16300 invoked by uid 22791); 29 Mar 2010 16:18:50 -0000 X-SWARE-Spam-Status: No, hits=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 29 Mar 2010 16:18:41 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2TGIdLH023830 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 29 Mar 2010 12:18:39 -0400 Received: from host0.dyn.jankratochvil.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2TGIWwF004890 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 29 Mar 2010 12:18:36 -0400 Received: from host0.dyn.jankratochvil.net (localhost [127.0.0.1]) by host0.dyn.jankratochvil.net (8.14.3/8.14.3) with ESMTP id o2TGIWLv003046 for ; Mon, 29 Mar 2010 18:18:32 +0200 Received: (from jkratoch@localhost) by host0.dyn.jankratochvil.net (8.14.3/8.14.3/Submit) id o2TGIW5U003045 for gdb-patches@sourceware.org; Mon, 29 Mar 2010 18:18:32 +0200 Date: Mon, 29 Mar 2010 16:18:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch 5/6] testsuite: Fix prelink-support.exp without prelink installed Message-ID: <20100329161831.GD2940@host0.dyn.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-08-17) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-03/txt/msg01003.txt.bz2 Hi, originally posted as: Re: [patch] testsuite: Fix break-interp.exp without prelink installed #2 http://sourceware.org/ml/gdb-patches/2010-03/msg00912.html Rediffed only (+that new one return). ------------------------------------------------------------------------------ Found now in a virtual machine that if you have no /usr/sbin/prelink testsuite produces: FAIL: gdb.base/break-interp.exp: LDprelinkNOdebugNO: unprelink break-interp-LDprelinkNOdebugNO ... # of expected passes 10 # of unexpected failures 6 Fixed it, it runs at least the parts it can + XFAILs the others. /usr/sbin/prelink installed: # of expected passes 1580 /usr/sbin/prelink not installed, no system libraries prelinked: # of expected passes 579 # of expected failures 12 XFAIL: gdb.base/break-interp.exp: LDprelinkNOdebugNO: BINprelinkYESdebugNOpieYES: prelink break-interp-BINprelinkYESdebugNOpieYES (missing /usr/sbin/prelink) /usr/sbin/prelink not installed but some system libraries prelinked - this should not normally happen: # of expected passes 12 # of unexpected failures 5 # of expected failures 1 FAIL: gdb.base/break-interp.exp: LDprelinkNOdebugNO: unprelink break-interp-LDprelinkNOdebugNO (missing /usr/sbin/prelink) (/home/jkratoch/redhat/gdb-clean/gdb/testsuite/gdb.base/break-interp-LDprelinkNOdebugNO is already prelinked) No regressions on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu for the whole patch series together. Thanks, Jan gdb/testsuite/ 2010-03-29 Jan Kratochvil Cope with missing /usr/sbin/prelink. * lib/prelink-support.exp (prelink_no): : New. (prelink_yes): Likewise. Return on failed prelink_no. --- a/gdb/testsuite/lib/prelink-support.exp +++ b/gdb/testsuite/lib/prelink-support.exp @@ -168,6 +168,29 @@ proc prelink_no {arg {name {}}} { set result [catch $command output] verbose -log "result is $result" verbose -log "output is $output" + if {$result == 1 && [regexp {^(couldn't execute "/usr/sbin/prelink[^\r\n]*": no such file or directory\n?)*$} $output]} { + # Without prelink at lest verify all the binaries do not contain the + # ".gnu.prelink_undo" section so that they are not already prelinked. + set test "$test (missing /usr/sbin/prelink)" + foreach bin [split $arg] { + if [string match "-*" $bin] { + # Skip prelink options. + continue + } + set readelf_program [transform readelf] + set command "exec $readelf_program -WS $bin" + verbose -log "command is $command" + set result [catch $command output] + verbose -log "result is $result" + verbose -log "output is $output" + if {$result != 0 || [string match {* .gnu.prelink_undo *} $output]} { + fail "$test ($bin is already prelinked)" + return 0 + } + } + pass $test + return 1 + } if {$result == 0 && $output == ""} { verbose -log "$name has been now unprelinked" set command "exec /usr/sbin/prelink -uN $arg" @@ -198,7 +221,9 @@ proc prelink_yes {arg {name ""}} { # Try to unprelink it first so that if it has been already prelinked before # we get different address now and the result is not affected by the # previous $arg state.. - prelink_no $arg "$name pre-unprelink" + if ![prelink_no $arg "$name pre-unprelink"] { + return 0 + } set test "prelink $name" @@ -216,6 +241,14 @@ proc prelink_yes {arg {name ""}} { set result [catch $command output] verbose -log "result is $result" verbose -log "output is $output" + if {$result == 1 && [regexp {^(couldn't execute "/usr/sbin/prelink[^\r\n]*": no such file or directory\n?)*$} $output]} { + set test "$test (missing /usr/sbin/prelink)" + # While we could check if $arg is already prelinked (as if someone + # uninstalls prelink after having the system ld.so prelinked) we cannot + # change its prelinked address. Therefore rather skip the test. + xfail $test + return 0 + } if {$result == 0 && $output == ""} { pass $test return 1