[pypy-commit] buildbot default: clean up - now we dont benchmark cpython nightly twice

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r528:6717b3a4b6a8
Date: 2011-07-16 17:22 +0200
http://bitbucket.org/pypy/buildbot/changeset/6717b3a4b6a8/

Log:	clean up - now we dont benchmark cpython nightly twice

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -288,9 +288,11 @@
         self.addStep(Translate(['-Ojit'], []))
         pypy_c_rel = "../build/pypy/translator/goal/pypy-c"
         self.addStep(ShellCmd(
-            description="run benchmarks on top of pypy-c-jit",
+            description="run benchmarks on top of pypy-c",
             command=["python", "runner.py", '--output-filename', 'result.json',
                     '--pypy-c', pypy_c_rel,
+                     '--baseline', pypy_c_rel,
+                     '--args', ',--jit off'
                      '--upload', #'--force-host', 'bigdog',
                      '--revision', WithProperties('%(got_revision)s'),
                      '--branch', WithProperties('%(branch)s')],
@@ -301,20 +303,6 @@
         self.addStep(transfer.FileUpload(slavesrc="benchmarks/result.json",
                                          masterdest=WithProperties(resfile),
                                          workdir="."))
-        self.addStep(ShellCmd(
-            description="run benchmarks on top of pypy-c no jit",
-            command=["python", "runner.py", '--output-filename', 'result.json',
-                    '--pypy-c', '../build/pypy/translator/goal/pypy-c',
-                     '--revision', WithProperties('%(got_revision)s'),
-                     '--upload', #'--force-host', 'bigdog',
-                     '--branch', WithProperties('%(branch)s'),
-                     '--args', ',--jit off'],
-            workdir='./benchmarks',
-            haltOnFailure=True))
-        resfile = os.path.expanduser("~/bench_results_nojit/%(got_revision)s.json")
-        self.addStep(transfer.FileUpload(slavesrc="benchmarks/result.json",
-                                         masterdest=WithProperties(resfile),
-                                         workdir="."))
 
 ##        self.addStep(ShellCmd(
 ##            description="run on top of python with psyco",