[PATCH] tevent-glib-glue

Ralph Böhme slow at samba.org
Fri Mar 29 18:39:57 UTC 2019



> Am 29.03.2019 um 19:26 schrieb Ralph Böhme <slow at samba.org>:
> 
> On Thu, Mar 28, 2019 at 11:17:04AM +0000, Noel Power wrote:
>> Hi Ralph
>> On 28/03/2019 11:02, Ralph Böhme wrote:
>>> 
>>>> Am 28.03.2019 um 11:39 schrieb Ralph Böhme <slow at samba.org>:
>>>> 
>>>> 
>>>> 
>> [...]
>>>> well, if you think about it, it makes sense... As the problem is that the revents we try to pass from tevent to glib is dropped in g_main_context_check, so the the fd event source is not marked as G_SOURCE_READY, calling g_main_context_dispatch() doesn't help.
>>>> 
>>>> Looks like we have to wait for the sn-devel upgrade to sn-devel-184 to happen. I'll see if the test passes there. Fingers crossed...
>>> slow at sn-devel-184:~/git/samba/scratch$ bin/tevent_glib_glue_test
>>> /mainloop/timeouts: OK
>>> /mainloop/glib_ev_source: OK
>>> /mainloop/tevent_ev_source: OK
>>> /mainloop/unix-fd: OK
>>> 
>>> *phew*
>>> 
>>> So lets wait til we get sn-devel-184...
>>> 
>> well RB+ from me on the patches anyway, ...
> 
> Thanks a *lot* for working this out with me!
> 
> Turns out that the reworked waf configure check that made the check for flex independent of --enable-spotlight triggers a strange bug waf when flex is not installed.
> 
> This was observed on the new gitlab runners I've been working on today with metze:
> 
> https://gitlab.com/samba-team/devel/samba/-/jobs/186787093
> 
> Checking for program 'flex'                                                                     : not found Traceback (most recent call last):
> File "/tmp/samba-testbase/b29/samba/third_party/waf/waflib/Scripting.py", line 158, in waf_entry_point
>   run_commands()
> File "/tmp/samba-testbase/b29/samba/third_party/waf/waflib/Scripting.py", line 251, in run_commands
>   ctx = run_command(cmd_name)
> File "/tmp/samba-testbase/b29/samba/third_party/waf/waflib/Scripting.py", line 235, in run_command
>   ctx.execute()
> File "/tmp/samba-testbase/b29/samba/third_party/waf/waflib/Configure.py", line 159, in execute
>   super(ConfigurationContext, self).execute()
> File "/tmp/samba-testbase/b29/samba/third_party/waf/waflib/Context.py", line 204, in execute
>   self.recurse([os.path.dirname(g_module.root_path)])
> File "/tmp/samba-testbase/b29/samba/third_party/waf/waflib/Context.py", line 286, in recurse
>   user_function(self)
> File "/tmp/samba-testbase/b29/samba/wscript", line 307, in configure
>   conf.RECURSE('source3')
> File "./buildtools/wafsamba/samba_utils.py", line 66, in fun
>   return f(*k, **kw)
> File "./buildtools/wafsamba/samba_utils.py", line 481, in RECURSE
>   return ctx.recurse(relpath)
> File "/tmp/samba-testbase/b29/samba/third_party/waf/waflib/Context.py", line 286, in recurse
>   user_function(self)
> File "/tmp/samba-testbase/b29/samba/source3/wscript", line 1659, in configure
>   flex.configure(conf)
> File "/tmp/samba-testbase/b29/samba/third_party/waf/waflib/Tools/flex.py", line 59, in configure
>   if re.search (r"\\msys\\[0-9.]+\\bin\\flex.exe$", conf.env.FLEX[0]):
> 
> The attached tevent-glib-glue patchset has three additional commits (1, 3 and 4) that fix this and two other small error in the flex and bison checks.
> 
> Please review & don't push, just let me know the result. :)))

CI: https://gitlab.com/samba-team/devel/samba/pipelines/54301201

This is on top of metze's, Joe's and Samuel's patches for the gitlab image automation, so this runs the tevent-glib-glue on opensuse150

https://gitlab.com/samba-team/devel/samba/commit/e9b49825a43b62b4c99e2bf5e3429ad471442bb5

and with glib2-devel installed:

https://gitlab.com/samba-team/devel/samba/commit/dad39f883c57e3fd4ad50099fcbc379216e89c27

-slow


More information about the samba-technical mailing list