From owner-svn-src-stable-11@freebsd.org Sun Jun 28 02:26:44 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B82F633C894; Sun, 28 Jun 2020 02:26:44 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vZJ44RhZz3WNm; Sun, 28 Jun 2020 02:26:44 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 8E97926C2E; Sun, 28 Jun 2020 02:26:44 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f42.google.com with SMTP id el4so2125040qvb.13; Sat, 27 Jun 2020 19:26:44 -0700 (PDT) X-Gm-Message-State: AOAM532zXkokzGjLs35EXu+Sl++TuHwxOzwXaBv20vmRgkq7hlGOzB5n v2b64PlOwStPUiIvPxN2YlViNwtIECitkT/EWp8= X-Google-Smtp-Source: ABdhPJxBfqscDhpuzV4OOvX//ZJdjKN0HzmjuUWgvFIc5dPCM7jqmWa/AEnKe0mFsdUan4PAwWc7dmPxoW+1H9+MdPM= X-Received: by 2002:a0c:9ba0:: with SMTP id o32mr9645871qve.129.1593311203998; Sat, 27 Jun 2020 19:26:43 -0700 (PDT) MIME-Version: 1.0 References: <202006272251.05RMpGxH086999@repo.freebsd.org> <1c896bbe-7a85-bc76-5163-cf83a0c39b8e@FreeBSD.org> In-Reply-To: <1c896bbe-7a85-bc76-5163-cf83a0c39b8e@FreeBSD.org> From: Kyle Evans Date: Sat, 27 Jun 2020 21:26:31 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r362710 - stable/11/usr.bin/sed/tests To: Mateusz Piotrowski <0mp@freebsd.org> Cc: src-committers , svn-src-all , svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jun 2020 02:26:44 -0000 On Sat, Jun 27, 2020 at 6:32 PM Mateusz Piotrowski <0mp@freebsd.org> wrote: > > On 6/28/20 1:28 AM, Kyle Evans wrote: > > (sorry, still on mobile) > > Please restore escape_subst...as per my last email, it was only hex_subst that needed to go away. The former was already there. > > On Sat, Jun 27, 2020, 17:51 Mateusz Piotrowski <0mp@freebsd.org> wrote: >> >> Author: 0mp (doc,ports committer) >> Date: Sat Jun 27 22:51:15 2020 >> New Revision: 362710 >> URL: https://svnweb.freebsd.org/changeset/base/362710 >> >> Log: >> Disable mismerged tests committed in r362687 >> >> Reported by: lwhsu >> >> Modified: >> stable/11/usr.bin/sed/tests/sed2_test.sh >> >> Modified: stable/11/usr.bin/sed/tests/sed2_test.sh >> ============================================================================== >> --- stable/11/usr.bin/sed/tests/sed2_test.sh Sat Jun 27 21:37:48 2020 (r362709) >> +++ stable/11/usr.bin/sed/tests/sed2_test.sh Sat Jun 27 22:51:15 2020 (r362710) >> @@ -92,7 +92,5 @@ atf_init_test_cases() >> atf_add_test_case inplace_command_q >> atf_add_test_case inplace_hardlink_src >> atf_add_test_case inplace_symlink_src >> - atf_add_test_case escape_subst >> atf_add_test_case commands_on_stdin >> - atf_add_test_case hex_subst >> } > > I've tested the change and atf_add_test_case escape_subst was also failing... > > Would you like me to bring back escape_subst? Back at a machine, I see now that I looked at the wrong commit and apparently did infact not merge \r, \n, and \t back, so this was my bad -- these tests are now as they should be as of this commit, sorry about that. Thanks! Kyle Evans