Commits

Antonio Cuni  committed 7cdc6fe Merge

merge

  • Participants
  • Parent commits 347f00d, 34d7331

Comments (0)

Files changed (2)

File bot2/pypybuildbot/builds.py

             command=prefix + ["python", "testrunner/runner.py",
                      "--logfile=pytest-A.log",
                      "--config=pypy/pytest-A.cfg",
-                     "--root=pypy", "--timeout=1800"
+                     "--root=pypy", "--timeout=3600"
                      ] + ["--config=%s" % cfg for cfg in app_tests],
             logfiles={'pytestLog': 'pytest-A.log'},
             timeout=4000,
             description="lib-python test",
             command=prefix + ["python", "pypy/test_all.py",
                      "--pypy=pypy/translator/goal/pypy-c",
-                     "--timeout=1800",
+                     "--timeout=3600",
                      "--resultlog=cpython.log", "lib-python"],
             timeout=4000,
             logfiles={'pytestLog': 'cpython.log'}))

File bot2/pypybuildbot/master.py

 
 pypyOwnTestFactory = pypybuilds.Own()
 pypyOwnTestFactoryWin = pypybuilds.Own(platform="win32")
+pypyOwnTestFactoryIndiana = pypybuilds.Own(platform="indiana32")
 pypyJitOnlyOwnTestFactory = pypybuilds.Own(cherrypick="jit")
 
 # OSX 32bit tests require a larger timeout to finish
     interpreter='python',
     )
 
+pypyJITTranslatedTestFactoryIndiana = pypybuilds.Translated(
+    translationArgs=jit_translation_args,
+    targetArgs=[],
+    lib_python=True,
+    pypyjit=True,
+    app_tests=True,
+    platform='openindiana32',
+    )
+
 pypyJITTranslatedTestFactoryOSX = pypybuilds.Translated(
     platform='osx',
     translationArgs=jit_translation_args,
 LINUX32 = "own-linux-x86-32"
 LINUX64 = "own-linux-x86-64"
 LINUXPPC64 = "own-linux-ppc-64"
+INDIANA32 = "own-indiana-x86-32"
 
 MACOSX32 = "own-macosx-x86-32"
 WIN32 = "own-win-x86-32"
 JITWIN32 = "pypy-c-jit-win-x86-32"
 JITWIN64 = "pypy-c-jit-win-x86-64"
 JITFREEBSD64 = 'pypy-c-jit-freebsd-7-x86-64'
+JITINDIANA32 = "pypy-c-jit-indiana-x86-32"
 
 JITBACKENDONLYLINUXARMEL = "jitbackendonly-own-linux-armel"
 JITBACKENDONLYLINUXARMELXDIST = "jitbackendonly-own-linux-armel-xdist"
                    'factory': pypyJITTranslatedTestFactoryPPC64,
                    'category': 'linux-ppc64',
                    },
+                  # openindiana
+                  {'name': JITINDIANA32,
+                   'slavenames': ['jcea-openindiana-32'],
+                   'builddir': JITINDIANA32,
+                   'factory': pypyJITTranslatedTestFactoryIndiana,
+                   'category': 'openindiana32',
+                   },
+                  {'name': INDIANA32,
+                   'slavenames': ['jcea-openindiana-32'],
+                   'builddir': INDIANA32,
+                   'factory': pypyOwnTestFactoryIndiana,
+                   'category': 'openindiana32',
+                   },
                   # ARM
                   # armel
                   {"name": JITBACKENDONLYLINUXARMELXDIST,