reenable some tests

tests/bugs.txt

@@ -50,6 +50,4 @@ pyregr.test_tuple
 all
 any
 builtin_sorted
-dictcomp
 inlined_generator_expressions
-setcomp

tests/run/dictcomp.pyx

@@ -15,12 +15,13 @@ def dictcomp():
     assert x == 'abc' # do not leak!
     return result
 
-@cython.test_fail_if_path_exists(
-    "//GeneratorExpressionNode",
-    "//SimpleCallNode")
-@cython.test_assert_path_exists(
-    "//ComprehensionNode",
-    "//ComprehensionNode//DictComprehensionAppendNode")
+# enable when inlined:
+#@cython.test_fail_if_path_exists(
+#    "//GeneratorExpressionNode",
+#    "//SimpleCallNode")
+#@cython.test_assert_path_exists(
+#    "//ComprehensionNode",
+#    "//ComprehensionNode//DictComprehensionAppendNode")
 def genexpr():
     """
     >>> type(genexpr()) is dict
@@ -37,7 +38,7 @@ def genexpr():
 
 cdef class A:
     def __repr__(self): return u"A"
-    def __richcmp__(one, other, op): return one is other
+    def __richcmp__(one, other, int op): return one is other
     def __hash__(self): return id(self) % 65536
 
 def typed_dictcomp():

tests/run/setcomp.pyx

@@ -20,12 +20,13 @@ def setcomp():
     assert x == 'abc' # do not leak
     return result
 
-@cython.test_fail_if_path_exists(
-    "//GeneratorExpressionNode",
-    "//SimpleCallNode")
-@cython.test_assert_path_exists(
-    "//ComprehensionNode",
-    "//ComprehensionNode//ComprehensionAppendNode")
+# enable when inlined:
+#@cython.test_fail_if_path_exists(
+#    "//GeneratorExpressionNode",
+#    "//SimpleCallNode")
+#@cython.test_assert_path_exists(
+#    "//ComprehensionNode",
+#    "//ComprehensionNode//ComprehensionAppendNode")
 def genexp_set():
     """
     >>> type(genexp_set()) is _set
@@ -42,7 +43,7 @@ def genexp_set():
 
 cdef class A:
     def __repr__(self): return u"A"
-    def __richcmp__(one, other, op): return one is other
+    def __richcmp__(one, other, int op): return one is other
     def __hash__(self): return id(self) % 65536
 
 def typed():