setup: pass --reactor=poll to trial unless REACTOR variable is set, in which case...

This hopefully works around the problem that Twisted v8.1.0 has a bug when used
with pyOpenSSL v0.7 which bug causes some unit tests to spuriously fail -- see
known_issues.txt r2788:

http://allmydata.org/trac/tahoe/browser/docs/known_issues.txt?rev=2788#L122

Also it matches with the fact that --reactor=poll is required on cygwin.

diff --git a/Makefile b/Makefile
index 280f78649ae5fc47bef626bb7e25929351941f89..0b3906a129ce1a836c532296eed149ce2cea39e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,6 @@ PYTHON=python
 PATHSEP=$(shell $(PYTHON) -c 'import os ; print os.pathsep')
 OSSEP=$(shell $(PYTHON) -c 'import os ; print os.sep')
 
-REACTOR=
-
 ifneq ($(INCLUDE_DIRS),)
 INCLUDE_DIRS_ARG = -I$(INCLUDE_DIRS)
 endif
@@ -31,14 +29,10 @@ else
        CHECK_PYWIN32_DEP := 
 endif
 
-ifeq ($(PLAT),cygwin)
-REACTOR = poll
-endif
-
 ifneq ($(REACTOR),)
        REACTOROPT := --reactor=$(REACTOR)
 else
-       REACTOROPT := 
+       REACTOROPT := --reactor=poll
 endif
 
 ifneq ($(PYTHONPATH),)