go back to threading cython step

gevent/callbacks.c

 /* Copyright (c) 2011-2012 Denis Bilenko. See LICENSE for details. */
 #ifdef Py_PYTHON_H
 
-#if 0
+#if 1
+/* name generated by cython when we use threads */
 #define _GEVENTLOOP struct __pyx_vtabstruct_8corecext_loop
 #else
 #define _GEVENTLOOP struct __pyx_vtabstruct_6gevent_8corecext_loop

greentest/testrunner.py

@@ -20,6 +20,15 @@ if NWORKERS > 10:
     NWORKERS = 10
 
 
+RUNNING_ON_TRAVIS = os.environ.get('TRAVIS')
+RUNNING_ON_APPVEYOR = os.environ.get('APPVEYOR')
+RUNNING_ON_CI = RUNNING_ON_TRAVIS or RUNNING_ON_APPVEYOR
+
+if RUNNING_ON_CI:
+    # Too many and we get spurious timeouts
+    NWORKERS = 6
+
+
 # tests that don't do well when run on busy box
 RUN_ALONE = [
     'test__threadpool.py',

util/cythonpp.py

@@ -88,10 +88,10 @@ def _run_cython_on_file(configuration, pyx_filename,
     # XXX: Note that this causes cython to generate
     # a "corecext" name instead of "gevent.corecext"
     tempdir = tempfile.mkdtemp()
-    unique_pyx_filename = pyx_filename
-    unique_output_filename = output_filename
-    #unique_pyx_filename = os.path.join(tempdir, pyx_filename)
-    #unique_output_filename = os.path.join(tempdir, output_filename)
+    #unique_pyx_filename = pyx_filename
+    #unique_output_filename = output_filename
+    unique_pyx_filename = os.path.join(tempdir, pyx_filename)
+    unique_output_filename = os.path.join(tempdir, output_filename)
 
     dirname = os.path.dirname(unique_pyx_filename) # output must be in same dir
     log("Output filename %s", unique_output_filename)
@@ -124,7 +124,7 @@ def _run_cython_on_files(pyx_filename, py_banner, banner, output_filename, prepr
                                     counter, lines,
                                     cache)))
         threads[-1].start()
-        threads[-1].join()
+        #threads[-1].join()
 
     for t in threads:
         t.join()