]> granicus.if.org Git - libevent/commitdiff
Link test/regress with event_core/event_extra over event
authorAzat Khuzhin <azat@libevent.org>
Sun, 24 Mar 2019 22:40:46 +0000 (01:40 +0300)
committerAzat Khuzhin <azat@libevent.org>
Mon, 25 Mar 2019 06:54:32 +0000 (09:54 +0300)
Due to regress linked with event and event_core (both of them includes
evthread.c) there will be two different evthread_id_fn_ variables under
mingw64:
  evthread_id_fn_: &0x5294f20a8
  evthread_id_fn_: &0x4ba0030a8

And because of this evthread_use_pthreads() can/will set one copy of
variables while evthread*() functions will access another, which will
break a lot of things (for example main/del_notify test).

Fixes: #792
test/include.am

index ee2ab5ffc3a35b961c723393bd2981cf688148f9..043752471aed7793319b22829a2af9c12bf8108c 100644 (file)
@@ -140,7 +140,7 @@ if BUILD_WIN32
 test_regress_SOURCES += test/regress_iocp.c
 endif
 
-test_regress_LDADD = $(LIBEVENT_GC_SECTIONS) libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
+test_regress_LDADD = $(LIBEVENT_GC_SECTIONS) libevent_core.la libevent_extra.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
 test_regress_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS) -Itest
 test_regress_LDFLAGS = $(PTHREAD_CFLAGS)