Commits

Maciej Fijalkowski  committed 6ba1484 Merge

merge

  • Participants
  • Parent commits 07225eb, b99cd90

Comments (0)

Files changed (2)

File pypy/module/cppyy/test/conftest.py

 import py
 
+@py.test.mark.tryfirst
 def pytest_runtest_setup(item):
     if py.path.local.sysfind('genreflex') is None:
         py.test.skip("genreflex is not installed")

File rpython/jit/backend/conftest.py

 
 def pytest_addoption(parser):
     group = parser.getgroup('random test options')
-    group.addoption('--random-seed', action="store", type="int",
+    group.addoption('--random-seed', action="store", type=int,
                     default=random.randrange(0, 10000),
                     dest="randomseed",
                     help="choose a fixed random seed")
                     choices=['llgraph', 'cpu'],
                     dest="backend",
                     help="select the backend to run the functions with")
-    group.addoption('--block-length', action="store", type="int",
+    group.addoption('--block-length', action="store", type=int,
                     default=30,
                     dest="block_length",
                     help="insert up to this many operations in each test")
-    group.addoption('--n-vars', action="store", type="int",
+    group.addoption('--n-vars', action="store", type=int,
                     default=10,
                     dest="n_vars",
                     help="supply this many randomly-valued arguments to "
                          "the function")
-    group.addoption('--repeat', action="store", type="int",
+    group.addoption('--repeat', action="store", type=int,
                     default=15,
                     dest="repeat",
                     help="run the test this many times"),
-    group.addoption('--output', '-O', action="store", type="str",
+    group.addoption('--output', '-O', action="store", type=str,
                     default="", dest="output",
                     help="dump output to a file")