[pypy-svn] r72326 - pypy/build/bot2/pypybuildbot

[fijal at codespeak.net]

Author: fijal
Date: Wed Mar 17 18:35:33 2010
New Revision: 72326

Modified:
   pypy/build/bot2/pypybuildbot/builds.py
   pypy/build/bot2/pypybuildbot/master.py
Log:
Try to upload nightly builds. As usual with buildbot, unsure...
Also make platform=osx on mac, to make executable name different


Modified: pypy/build/bot2/pypybuildbot/builds.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/builds.py	(original)
+++ pypy/build/bot2/pypybuildbot/builds.py	Wed Mar 17 18:35:33 2010
@@ -109,10 +109,16 @@
                 logfiles={'pytestLog': 'cpython.log'}))
 
         if pypyjit:
+            # upload nightly build, if we're running jit tests
+            nightly = 'nightly/pypy-c-jit-%(got_revision)s-' + platform
+            pypy_c_rel = 'pypy/translator/goal/pypy-c'
+            self.addStep(transfer.FileUpload(slavesrc=pypy_c_rel,
+                                             masterdest=WithProperties(nightly),
+                                             workdir='.'))
             self.addStep(ShellCmd(
                 description="pypyjit tests",
                 command=["python", "pypy/test_all.py",
-                         "--pypy=pypy/translator/goal/pypy-c",
+                         "--pypy=" + pypy_c_rel,
                          "--resultlog=pypyjit.log",
                          "pypy/module/pypyjit/test"],
                 logfiles={'pytestLog': 'pypyjit.log'}))            
@@ -128,10 +134,11 @@
                      'benchmarks'],
             workdir='.'))
         self.addStep(Translate(['-Ojit'], []))
+        pypy_c_rel = "../build/pypy/translator/goal/pypy-c"
         self.addStep(ShellCmd(
             description="run more benchmarks on top of pypy-c-jit",
             command=["python", "runner.py", '--output-filename', 'result.json',
-                    '--pypy-c', '../build/pypy/translator/goal/pypy-c',
+                    '--pypy-c', pypy_c_rel,
                      '--upload', '--force-host', 'bigdog',
                      '--revision', WithProperties('%(got_revision)s'),
                      '--branch', WithProperties('%(branch)s')],

Modified: pypy/build/bot2/pypybuildbot/master.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/master.py	(original)
+++ pypy/build/bot2/pypybuildbot/master.py	Wed Mar 17 18:35:33 2010
@@ -79,6 +79,15 @@
     app_tests=True,
     )
 
+pypyJITTranslatedTestFactoryOSX = pypybuilds.Translated(
+    platform='osx'
+    translationArgs=jit_translation_args,
+    targetArgs=[],
+    lib_python=True,
+    pypyjit=True,
+    app_tests=True,
+    )
+
 pypyJITTranslatedTestFactoryWin = pypybuilds.Translated(
     platform="win32",
     translationArgs=jit_translation_args,
@@ -185,7 +194,7 @@
                   {"name" : JITMACOSX32,
                    "slavenames": ["minime"],
                    'builddir' : JITMACOSX32,
-                   'factory' : pypyJITTranslatedTestFactory,
+                   'factory' : pypyJITTranslatedTestFactoryOSX,
                    'category' : 'jit',
                    },
                   {"name" : JITWIN32,