From nobody Fri Mar 08 05:55:27 2024 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 4Trb4H1zVmz5CwXg; Fri, 8 Mar 2024 05:55:27 +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 4Trb4H1P5xz4dG9; Fri, 8 Mar 2024 05:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709877327; 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=r2gqIHriwJPcDhw86dBbHwAQAr0bf/KGT3AIZS5Oei4=; b=K0C53HVCJGQLpheXFEWo2hjBqwm9An6aLVC4+6W7hkexq9v+gDnv9Dk+oUvRh+lKJaek/K JRZ4v5sv7kF6AUr6NsbjU8uT51B+Eb6QP/8jtbG8giHUcYFRXqZwydGSBk4aRtKMMtfjiZ +yMf9lveBpLOwaHElGrIDt8h2N7PMXrLShZ5x8/HoHBaoj8D7fC6A7wbBrnPlQCorrLXCA zJvH/YqVMwMBXbNx93Fuhfel18AqnZHgJZ+CASqJ1PN7cDjxn+KAuLHXBC0DJLlDhe9hb5 hBxsqDAl+5j8LKxQZdScGi3pSSlqb22TaLv85TcOkirimzvIcqtfUAJiLwxkIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709877327; a=rsa-sha256; cv=none; b=fNrblo8DJIC5fIFvM+RSodhYn+iEdxzUGly1YSWREGpWEvcqZsi1mXeB+ROcuqu/IriJz4 VnJiFhUEangDFGGPUqfZUkgOw8UCwbW5FntCRRjikcY8bEwW+5TDQ5L6GwQTLORNv5mVz6 mU8XkWcNoRG3IJmaFxwkfgmqjZLILoF9uCv1/mhzVivKkVllNBT8UtCWEVBD6ASTp8fLkc oie3FT2NPUlKH1/EGvDqHI4L9rb6FmbY5bJdq2Clfeae980GndSj26TcvC3TsVxhFW1CAz vKTK3vkgcMdpbWZOYKfqw3D+cUZP0q8ZcNnEhwUxjmpRXc57X9yCWORkCBGRyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709877327; 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=r2gqIHriwJPcDhw86dBbHwAQAr0bf/KGT3AIZS5Oei4=; b=EISl4PqbWl3+G3mXbVRDT3OUcXPoeu8es+fmU9c14+/EB0xW2gf6WdWu9hianDol6uFUgZ x754ISJwXsNprLa20q46mHSZc9b//DMLq/RKfQBjWCR2KZm8CeWrN080/rzfwZZ7Wc1wJQ Ap3Q9yK6Ygl8wiceoaFF4Vs1gnv+vgqBTVN13Hu1227xwIXdGHzq5NNd375z7FbjINxBm7 P4xyR3QKTu/7yN96+yhCdKDEcH2Zyz0rtlX/E0EcRfrKqnQrf2sGA34XWEiL2Z2pAG54gx mJ2bMlAGbM+AgycwIkQIx0EPEvKIP0pTnIbD4ejtQzHxT/1X2WKakOHOOHcIHQ== 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 4Trb4H10Yrz15bY; Fri, 8 Mar 2024 05:55:27 +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 4285tRT3023943; Fri, 8 Mar 2024 05:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4285tRhA023940; Fri, 8 Mar 2024 05:55:27 GMT (envelope-from git) Date: Fri, 8 Mar 2024 05:55:27 GMT Message-Id: <202403080555.4285tRhA023940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ba7b7f94c239 - main - awk: Fix the tests 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/main X-Git-Reftype: branch X-Git-Commit: ba7b7f94c239ce43343d7af403734fdc941b7664 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ba7b7f94c239ce43343d7af403734fdc941b7664 commit ba7b7f94c239ce43343d7af403734fdc941b7664 Author: Warner Losh AuthorDate: 2024-03-08 05:40:43 +0000 Commit: Warner Losh CommitDate: 2024-03-08 05:52:56 +0000 awk: Fix the tests I'd forgotten that we have to adjust the stderr tests from upstream. Remove the OK files. Also remove system-status.*. These restore the fixes I made in 517e52b6c21c which were lost when I imported the last version of awk. Also, force LANG to be C.UTF-8 when testing to ensure that stray lang settings don't fail tests. Sponsored by: Netflix --- contrib/one-true-awk/bugs-fixed/missing-precision.ok | 2 -- contrib/one-true-awk/bugs-fixed/negative-nf.ok | 2 -- contrib/one-true-awk/bugs-fixed/pfile-overflow.ok | 4 ---- contrib/one-true-awk/bugs-fixed/system-status.awk | 19 ------------------- contrib/one-true-awk/bugs-fixed/system-status.bad | 3 --- contrib/one-true-awk/bugs-fixed/system-status.ok | 3 --- contrib/one-true-awk/bugs-fixed/system-status.ok2 | 3 --- usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh | 1 + 8 files changed, 1 insertion(+), 36 deletions(-) diff --git a/contrib/one-true-awk/bugs-fixed/missing-precision.ok b/contrib/one-true-awk/bugs-fixed/missing-precision.ok deleted file mode 100644 index 75e1e3d00446..000000000000 --- a/contrib/one-true-awk/bugs-fixed/missing-precision.ok +++ /dev/null @@ -1,2 +0,0 @@ -../a.out: not enough args in printf(%*s) - source line number 1 diff --git a/contrib/one-true-awk/bugs-fixed/negative-nf.ok b/contrib/one-true-awk/bugs-fixed/negative-nf.ok deleted file mode 100644 index de97f8b27def..000000000000 --- a/contrib/one-true-awk/bugs-fixed/negative-nf.ok +++ /dev/null @@ -1,2 +0,0 @@ -../a.out: cannot set NF to a negative value - source line number 1 diff --git a/contrib/one-true-awk/bugs-fixed/pfile-overflow.ok b/contrib/one-true-awk/bugs-fixed/pfile-overflow.ok deleted file mode 100644 index a0de50f9007f..000000000000 --- a/contrib/one-true-awk/bugs-fixed/pfile-overflow.ok +++ /dev/null @@ -1,4 +0,0 @@ -../a.out: syntax error at source line 1 source file pfile-overflow.awk - context is - >>> <<< -../a.out: bailing out at source line 1 source file pfile-overflow.awk diff --git a/contrib/one-true-awk/bugs-fixed/system-status.awk b/contrib/one-true-awk/bugs-fixed/system-status.awk deleted file mode 100644 index 8daf563e6f4f..000000000000 --- a/contrib/one-true-awk/bugs-fixed/system-status.awk +++ /dev/null @@ -1,19 +0,0 @@ -# Unmodified nawk prints the 16 bit exit status divided by 256, but -# does so using floating point arithmetic, yielding strange results. -# -# The fix is to use the various macros defined for wait(2) and to -# use the signal number + 256 for death by signal, or signal number + 512 -# for death by signal with core dump. - -BEGIN { - status = system("exit 42") - print "normal status", status - - status = system("kill -HUP $$") - print "death by signal status", status - - status = system("kill -ABRT $$") - print "death by signal with core dump status", status - - system("rm -f core*") -} diff --git a/contrib/one-true-awk/bugs-fixed/system-status.bad b/contrib/one-true-awk/bugs-fixed/system-status.bad deleted file mode 100644 index a1317dba54a8..000000000000 --- a/contrib/one-true-awk/bugs-fixed/system-status.bad +++ /dev/null @@ -1,3 +0,0 @@ -normal status 42 -death by signal status 0.00390625 -death by signal with core dump status 0.523438 diff --git a/contrib/one-true-awk/bugs-fixed/system-status.ok b/contrib/one-true-awk/bugs-fixed/system-status.ok deleted file mode 100644 index 737828f5ed7a..000000000000 --- a/contrib/one-true-awk/bugs-fixed/system-status.ok +++ /dev/null @@ -1,3 +0,0 @@ -normal status 42 -death by signal status 257 -death by signal with core dump status 518 diff --git a/contrib/one-true-awk/bugs-fixed/system-status.ok2 b/contrib/one-true-awk/bugs-fixed/system-status.ok2 deleted file mode 100644 index f1f631e1cb33..000000000000 --- a/contrib/one-true-awk/bugs-fixed/system-status.ok2 +++ /dev/null @@ -1,3 +0,0 @@ -normal status 42 -death by signal status 257 -death by signal with core dump status 262 diff --git a/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh b/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh index 7c8cfa47f99e..588e2f86b0b7 100644 --- a/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh +++ b/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh @@ -25,6 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +export LANG=C.UTF-8 SRCDIR=$(atf_get_srcdir) check()