Hold off this patch, I have a better version incoming. Ross
On Mon, 12 Jul 2021 at 14:52, Ross Burton via lists.openembedded.org <ross=burtonini....@lists.openembedded.org> wrote: > > Signed-off-by: Ross Burton <ross.bur...@arm.com> > --- > meta/recipes-devtools/tcltk/tcl/interp.patch | 23 ++++++++++++++++++++ > meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 1 + > 2 files changed, 24 insertions(+) > create mode 100644 meta/recipes-devtools/tcltk/tcl/interp.patch > > diff --git a/meta/recipes-devtools/tcltk/tcl/interp.patch > b/meta/recipes-devtools/tcltk/tcl/interp.patch > new file mode 100644 > index 0000000000..f33dbb21ac > --- /dev/null > +++ b/meta/recipes-devtools/tcltk/tcl/interp.patch > @@ -0,0 +1,23 @@ > +Sometimes this test fails, and it appears as if this is because if the > system is > +loaded then the 'after 0' and 'after 10' blocks happen in the same iteration > of > +the interpretter and are executed in the wrong order. > + > +Increase the timeout on the 10ms interval to 1000ms to be a little more > forgiving > +of system load. > + > +Upstream-Status: Inappropriate > +Signed-off-by: Ross Burton <ross.bur...@arm.com> > + > +diff --git a/tests/interp.test b/tests/interp.test > +index 385d3e2ab..3b07ce30c 100644 > +--- a/tests/interp.test > ++++ b/tests/interp.test > +@@ -3599,7 +3599,7 @@ test interp-36.7 {ChildBgerror sets error handler of > child [1999035]} -setup { > + child eval { > + variable done {} > + after 0 error foo > +- after 10 [list ::set [namespace which -variable done] {}] > ++ after 1000 [list ::set [namespace which -variable done] {}] > + vwait [namespace which -variable done] > + } > + set result > diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb > b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb > index 0d7c2e4ac3..57a86e4c64 100644 > --- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb > +++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb > @@ -22,6 +22,7 @@ SRC_URI = "${BASE_SRC_URI} \ > file://fix_issue_with_old_distro_glibc.patch \ > file://tcl-remove-hardcoded-install-path.patch \ > file://alter-includedir.patch \ > + file://interp.patch \ > file://run-ptest \ > " > SRC_URI[sha256sum] = > "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa" > -- > 2.25.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#153794): https://lists.openembedded.org/g/openembedded-core/message/153794 Mute This Topic: https://lists.openembedded.org/mt/84153709/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-