From nobody Wed Aug 23 17:50:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RWDJW6Mm9z4r9pV; Wed, 23 Aug 2023 17:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RWDJW5LjRz4W3P; Wed, 23 Aug 2023 17:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2eKtB9W1paNC+f0yRakvyNTPa1NeOsCh1NlxYeLldzE=; b=vrNZ5B3VlJycF1Hg+lEW6jQQs6PDD0iq7IzQOiRl2FBQb12od2X/mJQPxMpZGGS+WYJYOt h7zqy0lXtuSeqHQVgbBYzdJBvkBd9eKVGFDLs0gNkIl1tlUq0CPIFDW4/FR86Ghf33qUKV JFDQnS4gU27dLhvuDBmVDwiASCF63jQ8NudqorOEiwDEfZoXU/RSWfWSlNXr2lzltMc85N CqLwk8BwOwXEPs4WVPzHOanoCRb3E7BUFdjJV9TS5Dyjj4HNQE9b9nF53PN9PZCChvHHkA fKvh0ghVGXWOZUpcvSMREo5yOOEbiQtyxOzlprUXEe51ZDUwurrg3IYU4cY6Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692813019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2eKtB9W1paNC+f0yRakvyNTPa1NeOsCh1NlxYeLldzE=; b=NS236dLkS6JL/rtWdNiMNup7YOHov69hAeTwIMubiVHJlFMwr7byd6AbB9ESh6Y9N3R8Ud w14HO6TmewkXnFTmOe36OBYsujJaou0QpCKJuoqiSQXrgpuAiW+RAVwYjLJfg6onC6mcvz MCplKKqQeJ3cQEn5nsIrTnl31kTgWcn18M8U1zQdvyBWg+kvNkZQTK8clmZzgq4WLpmqj9 Ez8G7fgv0SFt2kFZUcLxn+xkchxRgve9+lvYlJBHMGfkEBRLHjPINfsn6ezdcbo0368+dK wUKRyRKr82wU33LxW+aUp8depiyFMBtosX44VUmLhjHNeUROuJ/WncrYR62QoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692813019; a=rsa-sha256; cv=none; b=wt83hsCE8ayuADENg7Shr95ZmWBU2cCzvoTEEMcuk6IkGRqbmHCST/4xiGeNNjGDehaHuV A9/jDBJtOsRofgB+AlmMXVXxPt0mvxjxM1ptlfBdhsaSgBhi4vfNGmfjsAEGfknLv6SLcx 3ynkGR/+IKjrMG/jbzobyWPGnuUX7/IGcGbqzd/prdHe9YYF/+tRe5cJRseuKznifG43eK g+dPjL3c2TFNrZ9ypJ6Ug/OHY50dvLW6vUrwGMWKwv4+LN5EunGgjsgG4lpwjAYjH4/rfG 79bv3v7JtVOF7OivtDhJ5NY3B+qAulZSYtUZO9OIJw75utoWVOR1pYEFxHl1Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RWDJW498Nztsc; Wed, 23 Aug 2023 17:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NHoJgi050615; Wed, 23 Aug 2023 17:50:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NHoJ4t050612; Wed, 23 Aug 2023 17:50:19 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:50:19 GMT Message-Id: <202308231750.37NHoJ4t050612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c1c798f17481 - stable/13 - sh tests: Update $LINENO tests after $FreeBSD$ removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c1c798f174817b567f66379412c231ebfdcd7c8b Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1c798f174817b567f66379412c231ebfdcd7c8b commit c1c798f174817b567f66379412c231ebfdcd7c8b Author: Mark Johnston AuthorDate: 2023-08-23 17:24:36 +0000 Commit: Warner Losh CommitDate: 2023-08-23 17:45:13 +0000 sh tests: Update $LINENO tests after $FreeBSD$ removal Fixes: d0b2dbfa0ecf ("Remove $FreeBSD$: one-line sh pattern") (cherry picked from commit c903f664780e2df7aff9ca84089d55dec5ff1dae) --- bin/sh/tests/builtins/lineno.0.stdout | 4 ++-- bin/sh/tests/builtins/lineno3.0.stdout | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/sh/tests/builtins/lineno.0.stdout b/bin/sh/tests/builtins/lineno.0.stdout index 82583a93c82e..ab5ad9cbef51 100644 --- a/bin/sh/tests/builtins/lineno.0.stdout +++ b/bin/sh/tests/builtins/lineno.0.stdout @@ -1,9 +1,9 @@ +1 2 -3 2 3 +11 12 -13 foo foo 2 diff --git a/bin/sh/tests/builtins/lineno3.0.stdout b/bin/sh/tests/builtins/lineno3.0.stdout index 6e0e4ac8ca57..f8b44636cb5d 100644 --- a/bin/sh/tests/builtins/lineno3.0.stdout +++ b/bin/sh/tests/builtins/lineno3.0.stdout @@ -1,2 +1,2 @@ -before: 3 -after: 6 +before: 2 +after: 5