From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-80839-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 22492 invoked by alias); 5 May 2011 18:03:51 -0000
Received: (qmail 22483 invoked by uid 22791); 5 May 2011 18:03:50 -0000
X-SWARE-Spam-Status: No, hits=-6.9 required=5.0	tests=AWL,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; Thu, 05 May 2011 18:03:34 +0000
Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p45I3Yeo025801	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)	for <gdb-patches@sourceware.org>; Thu, 5 May 2011 14:03:34 -0400
Received: from dhcp-25-89.brq.redhat.com (pdp-11.brq.redhat.com [10.34.24.63])	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p45I3XoR018826	for <gdb-patches@sourceware.org>; Thu, 5 May 2011 14:03:33 -0400
Message-ID: <4DC2E674.1060608@redhat.com>
Date: Thu, 05 May 2011 18:03:00 -0000
From: Marek Polacek <mpolacek@redhat.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100827 Red Hat Thunderbird/3.1.3
MIME-Version: 1.0
To: "gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
Subject: [RFC] gdb.cp/static-print-quit.exp: fix racy tests (PR testsuite/12649)
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2011-05/txt/msg00150.txt.bz2

This test fails with Jan's read1() with:

ERROR: Window too small.
UNRESOLVED: gdb.cp/static-print-quit.exp: print c

This is because we expect to read:
"...Type <return> to continue, or q <return> to quit---$"

However, when using read1(), the "<return>" part matches with
this snippet from lib/gdb.exp:

         "<return>" {
            send_gdb "\n"
            perror "Window too small."
            fail "$message"
            ...

We can prevent this if we, in our gdb_test_multiple, create a "<return>"
case with `exp_continue'.  Nonetheless, except this, we must also in this
case:

    -re " to quit---$" {
        fail $test
        return -1
    }

differentiate between success and failure, since after processing the "<return>"
part we now have in the buffer " to quit---".  Thus, it is possible to do
something like this, using a new variable `seen_return', although I must say, I don't
like it at all.  But I don't see any other way how to cure this (at least yet) without
modifying the lib/gdb.exp.  Ran the test with both read{,1}.  Comments or complaints, please?

set test "print c"
set seen_return 0
gdb_test_multiple $test $test {
    "<return>" {
	incr seen_return
	exp_continue
    }
    -re "\\$\[0-9\]+ = \{loooooooooooooooooooooooooooooooooooooooooooooong = 0, static field = \{\r\n---Type " {
	incr seen_return
	exp_continue
    }
    -re " to continue, or q " {
	incr seen_return
	exp_continue
    }
    -re " to quit---$" {
        if { $seen_return >= 2 } {
	    pass $test
	} else { 
            fail $test
            return -1
	}
    }
}

Thanks,

	Marek