Date: Wed, 15 Nov 2023 15:33:51 -0700 From: Warner Losh <imp@bsdimp.com> To: Jessica Clarke <jrtc27@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: 3fd60a6b73ac - main - awk: Merge upstream 2nd Edition Awk Book Message-ID: <CANCZdfqx2oO77u4JEhz8Ev-h_BEQ_r7M_D0e0J1NB-ZDsv_ajQ@mail.gmail.com> In-Reply-To: <CANCZdfrGhUefkJDFxakr-xDfmQTiyO62U7uMSTtwAeAYpig1Xg@mail.gmail.com> References: <202311140451.3AE4p5AR014207@gitrepo.freebsd.org> <C3D101D8-77BB-4250-B934-18C711BADE46@freebsd.org> <CANCZdfq6tWv9skfuA2DAo6AEhJGgFJzVzdWTx3pW8eMaSk-GpQ@mail.gmail.com> <FEFB35D3-8C1E-4D78-A526-E56050B1B7E5@freebsd.org> <CANCZdfrGhUefkJDFxakr-xDfmQTiyO62U7uMSTtwAeAYpig1Xg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000000aa0ab060a388086 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Nov 15, 2023 at 3:20=E2=80=AFPM Warner Losh <imp@bsdimp.com> wrote: > > > On Wed, Nov 15, 2023 at 3:13=E2=80=AFPM Jessica Clarke <jrtc27@freebsd.or= g> wrote: > >> On 15 Nov 2023, at 21:59, Warner Losh <imp@bsdimp.com> wrote: >> > >> > >> > >> > On Wed, Nov 15, 2023 at 9:52=E2=80=AFAM Jessica Clarke <jrtc27@freebsd= .org> >> wrote: >> >> On 14 Nov 2023, at 04:51, Warner Losh <imp@FreeBSD.org> wrote: >> >> > >> >> > The branch main has been updated by imp: >> >> > >> >> > URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D3fd60a6b73ac01a72df89751f17397= 0fae4cae73 >> >> > >> >> > commit 3fd60a6b73ac01a72df89751f173970fae4cae73 >> >> > Merge: 194df014feeb 2e406c584fe4 >> >> > Author: Warner Losh <imp@FreeBSD.org> >> >> > AuthorDate: 2023-11-02 16:32:01 +0000 >> >> > Commit: Warner Losh <imp@FreeBSD.org> >> >> > CommitDate: 2023-11-14 04:49:34 +0000 >> >> > >> >> > awk: Merge upstream 2nd Edition Awk Book >> >> > >> >> > Merge in the November 2nd, 2023 version of one true awk. >> >> > >> >> > This brings in Unicode support, CSV support and a number of bug >> fixes. >> >> > >> >> > Sponsored by: Netflix >> >> > Reviewed by: delphij >> >> > Differential Revision: https://reviews.freebsd.org/D42447 >> >> >> >> This seems to have broken the GitHub CI for cross-building; contrast: >> >> >> >> https://github.com/freebsd/freebsd-src/actions/runs/6859373313 >> >> >> >> with: >> >> >> >> https://github.com/freebsd/freebsd-src/actions/runs/6859316228 >> >> >> >> Has this broken makeobjops.awk somehow? If so it should be reproducib= le >> >> on FreeBSD with BOOTSTRAP_ALL_TOOLS=3D1, or by rebuilding on an updat= ed >> >> system. Cross-building will just show it first because we always >> >> bootstrap awk there, like many other tools. >> > >> > It worked when it was the system awk for me... But that might not be >> the most >> > helpful observation. >> >> For a clean kernel build? >> >> > Why didn't it work for you/github's ci runs? >> >> From GitHub (indentation sadly lost when copying): >> >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam.c:45: >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam_ccb.h:1052: >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/cam/mmc/mmc_bus.h:4: >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/dev/mmc/bridge.h:57: >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/sys/bus.h:787: >> > ./bus_if.h:217:35: error: expected ')' >> > int _unit); >> > ^ >> > ./bus_if.h:216:33: note: to match this '(' >> > typedef device_t bus_add_child_t(device_t _dev, u_int _order, const >> char *_name >> > ^ >> > ./bus_if.h:241:41: error: expected ')' >> > const char *_name, int _unit) >> > ^ >> > ./bus_if.h:240:39: note: to match this '(' >> > static __inline device_t BUS_ADD_CHILD(device_t _dev, u_int _order >> > ^ >> > ... >> >> Hence the assumption that makeobjops.awk has stopped working properly, >> which is highly consistent with this being the first commit to fail in >> CI. It looks like we=E2=80=99re missing commas, maybe from format_line. >> >> I haven=E2=80=99t tried to reproduce it locally, but given it=E2=80=99s = across all >> macOS and Ubuntu versions I would be surprised if I couldn=E2=80=99t. >> >> > makeobjops.awk doesn't have any of the issues that I know are minor >> changes >> > in awk. I'll add it to the list of things to look into, though. >> >> On what timeline? If not soon, can we please revert the import as it=E2= =80=99s >> breaking important things and thus not ready for the tree? >> > > I wanted to try to recreate it, or figure out what in the env is causing = it > to go astray. I also want to confirm your diagnosis that this is coming > from this awk and not because we're building it to a weird new name > (so all my testing is with the old awk) and thus falling back to using > the system's awk... > > I don't like mysteries.... but if we still have one after spending > an hour or two on it, I'll revert. That puts it at anywhere from an hour > or two from now, or first thing in the morning worst case (eg, something > crazy comes up... though the odds of that are low). Otherwise I'll > commit a fix. > OK. As near as I can tell my pre-push testing was with the old-awk and old-test suite. The new awk with the new test suite shows the bigs. I think I did the tests from the wrong checked out tree, but I'm still trying to prove that to myself (I remember the results I got, and they only match old-awk + old-testsuite, not new-awk + new-testsuite). Sorry for the hassle this sloppiness has caused. Warner > Warner > > >> Jess >> >> > I also broke the Jenkins CI run, but not 'make check' for reasons I >> don't >> > understand. >> > >> > Warner >> >> >> --0000000000000aa0ab060a388086 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Wed, Nov 15, 2023 at 3:20=E2=80=AF= PM Warner Losh <<a href=3D"mailto:imp@bsdimp.com">imp@bsdimp.com</a>>= wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px = 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir= =3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote"><div dir= =3D"ltr" class=3D"gmail_attr">On Wed, Nov 15, 2023 at 3:13=E2=80=AFPM Jessi= ca Clarke <<a href=3D"mailto:jrtc27@freebsd.org" target=3D"_blank">jrtc2= 7@freebsd.org</a>> wrote:<br></div><blockquote class=3D"gmail_quote" sty= le=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);paddi= ng-left:1ex">On 15 Nov 2023, at 21:59, Warner Losh <<a href=3D"mailto:im= p@bsdimp.com" target=3D"_blank">imp@bsdimp.com</a>> wrote:<br> > <br> > <br> > <br> > On Wed, Nov 15, 2023 at 9:52=E2=80=AFAM Jessica Clarke <<a href=3D"= mailto:jrtc27@freebsd.org" target=3D"_blank">jrtc27@freebsd.org</a>> wro= te:<br> >> On 14 Nov 2023, at 04:51, Warner Losh <imp@FreeBSD.org> wrot= e:<br> >> > <br> >> > The branch main has been updated by imp:<br> >> > <br> >> > URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D3fd= 60a6b73ac01a72df89751f173970fae4cae73" rel=3D"noreferrer" target=3D"_blank"= >https://cgit.FreeBSD.org/src/commit/?id=3D3fd60a6b73ac01a72df89751f173970f= ae4cae73</a><br> >> > <br> >> > commit 3fd60a6b73ac01a72df89751f173970fae4cae73<br> >> > Merge: 194df014feeb 2e406c584fe4<br> >> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;<br> >> > AuthorDate: 2023-11-02 16:32:01 +0000<br> >> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;<br> >> > CommitDate: 2023-11-14 04:49:34 +0000<br> >> > <br> >> >=C2=A0 =C2=A0 awk: Merge upstream 2nd Edition Awk Book<br> >> > <br> >> >=C2=A0 =C2=A0 Merge in the November 2nd, 2023 version of one t= rue awk.<br> >> > <br> >> >=C2=A0 =C2=A0 This brings in Unicode support, CSV support and = a number of bug fixes.<br> >> > <br> >> >=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix<br> >> >=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 delphij<br> >> >=C2=A0 =C2=A0 Differential Revision:=C2=A0 <a href=3D"https://= reviews.freebsd.org/D42447" rel=3D"noreferrer" target=3D"_blank">https://re= views.freebsd.org/D42447</a><br> >> <br> >> This seems to have broken the GitHub CI for cross-building; contra= st:<br> >> <br> >> <a href=3D"https://github.com/freebsd/freebsd-src/actions/runs/685= 9373313" rel=3D"noreferrer" target=3D"_blank">https://github.com/freebsd/fr= eebsd-src/actions/runs/6859373313</a><br> >> <br> >> with:<br> >> <br> >> <a href=3D"https://github.com/freebsd/freebsd-src/actions/runs/685= 9316228" rel=3D"noreferrer" target=3D"_blank">https://github.com/freebsd/fr= eebsd-src/actions/runs/6859316228</a><br> >> <br> >> Has this broken makeobjops.awk somehow? If so it should be reprodu= cible<br> >> on FreeBSD with BOOTSTRAP_ALL_TOOLS=3D1, or by rebuilding on an up= dated<br> >> system. Cross-building will just show it first because we always<b= r> >> bootstrap awk there, like many other tools.<br> > <br> > It worked when it was the system awk for me...=C2=A0 But that might no= t be the most<br> > helpful observation.<br> <br> For a clean kernel build?<br> <br> > Why didn't it work for you/github's ci runs?<br> <br> >From GitHub (indentation sadly lost when copying):<br> <br> > In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/c= am/cam.c:45: <br> > In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/c= am/cam_ccb.h:1052: <br> > In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/c= am/mmc/mmc_bus.h:4: <br> > In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/d= ev/mmc/bridge.h:57: <br> > In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/s= ys/bus.h:787: <br> > ./bus_if.h:217:35: error: expected ')' <br> > int _unit); <br> > ^ <br> > ./bus_if.h:216:33: note: to match this '(' <br> > typedef device_t bus_add_child_t(device_t _dev, u_int _order, const ch= ar *_name <br> > ^ <br> > ./bus_if.h:241:41: error: expected ')' <br> > const char *_name, int _unit) <br> > ^ <br> > ./bus_if.h:240:39: note: to match this '(' <br> > static __inline device_t BUS_ADD_CHILD(device_t _dev, u_int _order <br= > > ^<br> > ...<br> <br> Hence the assumption that makeobjops.awk has stopped working properly,<br> which is highly consistent with this being the first commit to fail in<br> CI. It looks like we=E2=80=99re missing commas, maybe from format_line.<br> <br> I haven=E2=80=99t tried to reproduce it locally, but given it=E2=80=99s acr= oss all<br> macOS and Ubuntu versions I would be surprised if I couldn=E2=80=99t.<br> <br> > makeobjops.awk doesn't have any of the issues that I know are mino= r changes<br> > in awk. I'll add it to the list of things to look into, though.<br= > <br> On what timeline? If not soon, can we please revert the import as it=E2=80= =99s<br> breaking important things and thus not ready for the tree?<br></blockquote>= <div><br></div><div>I wanted to try to recreate it, or figure out what in t= he env is causing it</div><div>to go astray. I also want to confirm your di= agnosis that this is coming</div><div>from this awk and not because we'= re building it to a weird new name</div><div>(so all my testing is with the= old awk) and thus falling back to using</div><div>the system's awk...<= /div><div><br></div><div>I don't like mysteries.... but if we still hav= e one after spending</div><div>an hour or two on it, I'll revert. That = puts it at anywhere from an hour</div><div>or two from now, or first thing = in the morning worst case (eg, something</div><div>crazy comes up... though= the odds of that are low).=C2=A0 Otherwise I'll</div><div>commit a fix= .</div></div></div></blockquote><div><br></div><div>OK. As near as I can te= ll my pre-push testing was with the old-awk and old-test suite.</div><div>T= he new awk with the new test suite shows the bigs. I think I did the tests = from</div><div>the wrong checked out tree, but I'm still trying to prov= e that to myself (I remember the</div><div>results I got, and they only mat= ch old-awk=C2=A0+ old-testsuite, not new-awk + new-testsuite).</div><div><b= r></div><div>Sorry for the hassle this sloppiness has caused.</div><div><br= ></div><div>Warner</div><div>=C2=A0</div><blockquote class=3D"gmail_quote" = style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);pa= dding-left:1ex"><div dir=3D"ltr"><div class=3D"gmail_quote"><div>Warner</di= v><div>=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0p= x 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Jess<br> <br> > I also broke the Jenkins CI run, but not 'make check' for reas= ons I don't<br> > understand.<br> > <br> > Warner<br> <br> <br> </blockquote></div></div> </blockquote></div></div> --0000000000000aa0ab060a388086--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqx2oO77u4JEhz8Ev-h_BEQ_r7M_D0e0J1NB-ZDsv_ajQ>