From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by sourceware.org (Postfix) with ESMTPS id 8AF083858C66 for ; Mon, 23 Jan 2023 23:14:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8AF083858C66 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-lf1-x12f.google.com with SMTP id g13so20597495lfv.7 for ; Mon, 23 Jan 2023 15:14:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=unxEyM5WlAy3A+GGF4j+odcNoPQnlYf2+fV4bqVzyEY=; b=ZF5rrc6O0fAtl1rKZNQoKbJ83hQtBO4Ya2f24u49Tik6fvC+b0SeUI6oAPEWsiGXNg b4S910mKwJHqErYnmdB8SZJTx74xtLW5Q7zK4K93DolBxZu+SnljyravYm7vtufKTRUd HmEwA9Y27c8qx3AWOLT+c/pl8bciqgBKsu95lmmPcZXMMy+zVHqLlevz/UHUl+7PwI6J F3NZ2OmxW0ieCKo3RqhgUFwaGo8wuQvSa1PnWw2bwfsfHZEh9FgQwFxG9XheCiD91OoN vG6YDxszLXB9+fsfFJ0zZi1bpCqGUmVPbC9o9u7sTjQpowsuj40Ya7TfNryXvdQisqCd C24w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=unxEyM5WlAy3A+GGF4j+odcNoPQnlYf2+fV4bqVzyEY=; b=CfL6/5T0ck+UxBJsmFI2YwQRDfIPhhdsh2ghb5Vj8y8y9QcTj8s/5Rs4I2T3Kkw5jN vUvrTnNNWh1+3ywcGsLXk9MVkT4FiYXKWXs9MrZfyPivWJ89pzHmVJtU06k85zMR2cf+ ON53cGgi2sI8ek2podjaqQ0w5NeuYyLVmguGM8P2ZrRqkiaf68YHO5nZ+2dkvL7FSEDt jyVwIAUlYKS08D0WtOxukLRxqNWaiVp9rLW62IO4FupNXk5+X16FLiNv4PtaSicFWTxD IST1ZP52jc/Sy/E78llTg9vmdFLFTFhGM7jNal63lx0L7kHO80T+DUQ0nyfhOlNqkmgL KWBg== X-Gm-Message-State: AFqh2krikOM9aZ35oJAwoVTMMjXfF2OipTrSxCxdMQKGBfh1kNakoqBa N47XC4yGhe9necv2rKlf0IPdZ5LnDWTexzfS X-Google-Smtp-Source: AMrXdXt0maoAdjR2A8DnCilMCnIrrHSDhys1EaaOKhDhL7O+puB8xS4smWHrCQOK+GMBibgCEWkclQ== X-Received: by 2002:ac2:4c31:0:b0:4b3:9313:b2cf with SMTP id u17-20020ac24c31000000b004b39313b2cfmr6307662lfq.25.1674515666191; Mon, 23 Jan 2023 15:14:26 -0800 (PST) Received: from [192.168.219.3] ([78.8.192.131]) by smtp.gmail.com with ESMTPSA id x17-20020a19f611000000b004d583c83789sm18836lfe.147.2023.01.23.15.14.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jan 2023 15:14:24 -0800 (PST) Date: Mon, 23 Jan 2023 23:14:20 +0000 (GMT) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Andrew Burgess , Tom Tromey , Richard Bunt Subject: [PATCH v3 4/5] GDB/testsuite: Add `-nonl' option to `gdb_test' In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Add a `-nonl' option to `gdb_test' making it possible to match output from commands such as `output' that do not produce a new line sequence at the end, e.g.: (gdb) output 0 0(gdb) --- No change from v2. New change in v2. --- gdb/testsuite/lib/gdb.exp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) gdb-test-nonl.diff Index: src/gdb/testsuite/lib/gdb.exp =================================================================== --- src.orig/gdb/testsuite/lib/gdb.exp +++ src/gdb/testsuite/lib/gdb.exp @@ -1395,6 +1395,8 @@ proc gdb_test_multiline { name args } { # have any effect if -prompt is specified. # -lbl specifies that line-by-line matching will be used. # -nopass specifies that a PASS should not be issued. +# -nonl specifies that no \r\n sequence is expected between PATTERN +# and the gdb prompt. # # Returns: # 1 if the test failed, @@ -1410,6 +1412,7 @@ proc gdb_test { args } { {no-prompt-anchor} {lbl} {nopass} + {nonl} } lassign $args command pattern message question response @@ -1424,12 +1427,13 @@ proc gdb_test { args } { } set prompt [fill_in_default_prompt $prompt [expr !${no-prompt-anchor}]] + set nl [expr ${nonl} ? {""} : {"\[\r\n\]+"}] set saw_question 0 set user_code {} lappend user_code { - -re "\[\r\n\]*(?:$pattern)\[\r\n\]+$prompt" { + -re "\[\r\n\]*(?:$pattern)$nl$prompt" { if { $question != "" & !$saw_question} { fail $message } elseif {!$nopass} {