From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22718 invoked by alias); 30 Jun 2009 19:07:21 -0000 Received: (qmail 22708 invoked by uid 22791); 30 Jun 2009 19:07:20 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx2.redhat.com (HELO mx2.redhat.com) (66.187.237.31) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 30 Jun 2009 19:07:12 +0000 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5UJ7A4X013299 for ; Tue, 30 Jun 2009 15:07:10 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5UJ7APh028823 for ; Tue, 30 Jun 2009 15:07:10 -0400 Received: from host0.dyn.jankratochvil.net (sebastian-int.corp.redhat.com [172.16.52.221]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5UJ78GW015535 for ; Tue, 30 Jun 2009 15:07:09 -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 n5UJ78Nb003893 for ; Tue, 30 Jun 2009 21:07:08 +0200 Received: (from jkratoch@localhost) by host0.dyn.jankratochvil.net (8.14.3/8.14.3/Submit) id n5UJ77n9003892 for gdb-patches@sourceware.org; Tue, 30 Jun 2009 21:07:07 +0200 Date: Tue, 30 Jun 2009 19:07:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch] testsuite: Fix gdb.base/completion.exp for check// subdirectories. Message-ID: <20090630190707.GA3384@host0.dyn.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) 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: 2009-06/txt/msg00886.txt.bz2 Hi, currently when you run gdb.base/completion.exp by check//unix/-m64 etc. you get many FAILs due to initial failing: dir ../testsu^GiteFAIL: gdb.base/completion.exp: directory completion (timeout) as gdb/testsuite* has also the matches like `gdb/testsuite.unix.-m64'. Thanks, Jan PASS: gdb.base/completion.exp: complete 'p values[0] . a' PASS: gdb.base/completion.exp: complete 'p &values[0] -> a' PASS: gdb.base/completion.exp: cd to ${srcdir} -FAIL: gdb.base/completion.exp: directory completion (timeout) -FAIL: gdb.base/completion.exp: directory completion 2 +PASS: gdb.base/completion.exp: directory completion +PASS: gdb.base/completion.exp: directory completion 2 PASS: gdb.base/completion.exp: Glob remaining of directory test -FAIL: gdb.base/completion.exp: complete-command 'file ./gdb.base/compl' -FAIL: gdb.base/completion.exp: complete 'file ./gdb.base/complet' -FAIL: gdb.base/completion.exp: (timeout) complete 'info func marke' -FAIL: gdb.base/completion.exp: (timeout) complete 'set follow-fork-mode' -FAIL: gdb.base/completion.exp: (timeout) Completing non-existing component -FAIL: gdb.base/completion.exp: (timeout) Completing non-existing component #2 +PASS: gdb.base/completion.exp: complete-command 'file ./gdb.base/compl' +PASS: gdb.base/completion.exp: complete 'file ./gdb.base/complet' +PASS: gdb.base/completion.exp: complete 'info func marke' +PASS: gdb.base/completion.exp: complete 'set follow-fork-mode' +PASS: gdb.base/completion.exp: Completing non-existing component +PASS: gdb.base/completion.exp: Completing non-existing component #2 gdb/testsuite/ 2009-06-30 Jan Kratochvil * gdb.base/completion.exp (directory completion): Create the directory. New variables uniquedir, escapeduniquedir, uniquesu, uniquesub, escapeuniquesub. (directory completion 2): Expect now ${escapeuniquesub}. (Glob remaining of directory test): Remove one excessive newline. Expect the real output. --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -736,24 +736,30 @@ gdb_test "cd ${fullsrcdir}" \ # GDB used to fail adding / on directories, on the first try only -send_gdb "dir ../testsu\t" +set uniquedir ${objdir}/${subdir}/completion-uNiQuEdIr +set escapeduniquedir [string_to_regexp ${uniquedir}] +set uniquesu subdi +set uniquesub ${uniquesu}r +set escapeuniquesub [string_to_regexp ${uniquesub}] +file mkdir ${uniquedir}/${uniquesub} +send_gdb "dir ${uniquedir}\t" gdb_expect { - -re "../testsuite/$" { + -re "${escapeduniquedir}/" { pass "directory completion" - send_gdb "gdb.bas\t" + send_gdb "${uniquesu}\t" } - -re "../testsuite $" { + -re "${escapeduniquedir} $" { fail "directory completion (old gdb bug)" - send_gdb "\b/gdb.bas\t" + send_gdb "\b/${uniquesu}\t" } default { fail "directory completion (timeout)" - send_gdb "\ndir ../testsuite/gdb.bas\t" + send_gdb "\ndir ${uniquedir}/${uniquesu}\t" } } gdb_expect { - -re "gdb.base/$" { + -re "${escapeuniquesub}/$" { pass "directory completion 2" } timeout { @@ -761,7 +767,8 @@ gdb_expect { } } -gdb_test "\n" "" "Glob remaining of directory test" +# Empty COMMAND sends no newline while " " sends the newline we need. +gdb_test " " "Source directories searched: .*" "Glob remaining of directory test" send_gdb "complete file ./gdb.base/compl\n"