From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13396 invoked by alias); 6 May 2006 01:19:43 -0000 Received: (qmail 13385 invoked by uid 22791); 6 May 2006 01:19:42 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate1.de.ibm.com (HELO mtagate1.de.ibm.com) (195.212.29.150) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sat, 06 May 2006 01:19:35 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate1.de.ibm.com (8.13.6/8.13.6) with ESMTP id k461JXIv182628 for ; Sat, 6 May 2006 01:19:33 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.12.10/NCO/VER6.8) with ESMTP id k461KlSh066606 for ; Sat, 6 May 2006 03:20:47 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11/8.13.3) with ESMTP id k461JWE7010085 for ; Sat, 6 May 2006 03:19:32 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11/8.12.11) with SMTP id k461JWLU010082 for ; Sat, 6 May 2006 03:19:32 +0200 Message-Id: <200605060119.k461JWLU010082@d12av02.megacenter.de.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Sat, 6 May 2006 03:19:32 +0200 Subject: [PATCH] Fix spurious mi-basics.exp failures To: gdb-patches@sourceware.org Date: Sat, 06 May 2006 01:19:00 -0000 From: "Ulrich Weigand" X-Mailer: ELM [version 2.5 PL2] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2006-05/txt/msg00133.txt.bz2 Hello, I'm seeing some FAILs in the mi-basics test case. They're apparently caused by the expected output regexps in some of the mi_gdb_test statements lacking the 'serial number' the MI output lines start with. Most mi_gdb_test statments already contain that number, but the 202, 203, and 208 tests don't have it. Those are exactly the tests that fail for me. Adding the numbers fixes the test. Tested on s390-ibm-linux and s390x-ibm-linux. OK for mainline? ChangeLog: * gdb.mi/mi-basics.exp: Add missing serial number to expected output in some mi_gdb_test statements. * gdb.mi/mi2-basics.exp: Likewise. Index: gdb/testsuite/gdb.mi/mi-basics.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-basics.exp,v retrieving revision 1.12 diff -c -p -r1.12 mi-basics.exp *** gdb/testsuite/gdb.mi/mi-basics.exp 27 Sep 2005 22:39:01 -0000 1.12 --- gdb/testsuite/gdb.mi/mi-basics.exp 6 May 2006 00:55:38 -0000 *************** proc test_dir_specification {} { *** 160,170 **** set envirodir [string_to_regexp ${srcdir}/${subdir}] mi_gdb_test "202-environment-directory ${srcdir}/${subdir}" \ ! "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory arg operation" mi_gdb_test "203-environment-directory" \ ! "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory empty-string operation" mi_gdb_test "204-environment-directory -r" \ --- 160,170 ---- set envirodir [string_to_regexp ${srcdir}/${subdir}] mi_gdb_test "202-environment-directory ${srcdir}/${subdir}" \ ! "202\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory arg operation" mi_gdb_test "203-environment-directory" \ ! "203\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory empty-string operation" mi_gdb_test "204-environment-directory -r" \ *************** proc test_path_specification {} { *** 223,229 **** "environment-path no-args operation" mi_gdb_test "208-environment-path $srcdir $objdir" \ ! "\\\^done,path=\"$escapedsrcdir.$escapedobjdir.$orig_path\"" \ "environment-path dir1 dir2 operation" mi_gdb_test "209-environment-path -r $objdir" \ --- 223,229 ---- "environment-path no-args operation" mi_gdb_test "208-environment-path $srcdir $objdir" \ ! "208\\\^done,path=\"$escapedsrcdir.$escapedobjdir.$orig_path\"" \ "environment-path dir1 dir2 operation" mi_gdb_test "209-environment-path -r $objdir" \ Index: gdb/testsuite/gdb.mi/mi2-basics.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-basics.exp,v retrieving revision 1.4 diff -c -p -r1.4 mi2-basics.exp *** gdb/testsuite/gdb.mi/mi2-basics.exp 27 Sep 2005 22:39:03 -0000 1.4 --- gdb/testsuite/gdb.mi/mi2-basics.exp 6 May 2006 00:55:38 -0000 *************** proc test_dir_specification {} { *** 161,171 **** set envirodir [string_to_regexp ${srcdir}/${subdir}] mi_gdb_test "202-environment-directory ${srcdir}/${subdir}" \ ! "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory arg operation" mi_gdb_test "203-environment-directory" \ ! "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory empty-string operation" mi_gdb_test "204-environment-directory -r" \ --- 161,171 ---- set envirodir [string_to_regexp ${srcdir}/${subdir}] mi_gdb_test "202-environment-directory ${srcdir}/${subdir}" \ ! "202\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory arg operation" mi_gdb_test "203-environment-directory" \ ! "203\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory empty-string operation" mi_gdb_test "204-environment-directory -r" \ *************** proc test_path_specification {} { *** 226,232 **** "environment-path no-args operation" mi_gdb_test "208-environment-path $srcdir $objdir" \ ! "\\\^done,path=\"$escapedsrcdir.$escapedobjdir.$orig_path\"" \ "environment-path dir1 dir2 operation" mi_gdb_test "209-environment-path -r $objdir" \ --- 226,232 ---- "environment-path no-args operation" mi_gdb_test "208-environment-path $srcdir $objdir" \ ! "208\\\^done,path=\"$escapedsrcdir.$escapedobjdir.$orig_path\"" \ "environment-path dir1 dir2 operation" mi_gdb_test "209-environment-path -r $objdir" \ -- Dr. Ulrich Weigand Linux on zSeries Development Ulrich.Weigand@de.ibm.com