[pypy-svn] r56598 - pypy/build/bot

exarkun at codespeak.net exarkun at codespeak.net
Wed Jul 16 19:27:09 CEST 2008


Author: exarkun
Date: Wed Jul 16 19:27:08 2008
New Revision: 56598

Modified:
   pypy/build/bot/pypybuilders.py
Log:
re-instate uploads; but disable testing, because the reporter doesn't work at all

Modified: pypy/build/bot/pypybuilders.py
==============================================================================
--- pypy/build/bot/pypybuilders.py	(original)
+++ pypy/build/bot/pypybuilders.py	Wed Jul 16 19:27:08 2008
@@ -101,6 +101,8 @@
 class PyPyBuildFactory(BuildFactory):
     PyTestStep = None
 
+    executable = "pypy-c"
+
     def __init__(self, pytestArguments, translationArguments,
                  targetArguments, *a, **kw):
         BuildFactory.__init__(self, *a, **kw)
@@ -136,32 +138,33 @@
             translationArgs=translationArguments,
             targetArgs=targetArguments)
 
-        if pytestArguments is not None:
-            self.addStep(
-                self.PyTestStep,
-                testPackage="pypy",
-                testArguments=pytestArguments,
-                timeout=60 * 60)
-
-            self.addStep(
-                self.PyTestStep,
-                python="pypy/translator/goal/pypy-c",
-                testPackage="pypy",
-                # Exclude --boxed if it was specified, because -A shouldn't
-                # really use much memory.
-                testArguments=["-A"] + list(arg for arg in pytestArguments if arg != "--boxed"),
-                timeout=60 * 60)
-
-#         self.addStep(FileUpload,
-#                      slavesrc="pypy-src/pypy/translator/goal/pypy-c",
-#                      masterdest="pypy-c")
-# 
+        uploadSuffix = "".join(translationArguments + targetArguments)
+        self.addStep(FileUpload,
+                     slavesrc="pypy-src/pypy/translator/goal/" + self.executable,
+                     masterdest="public_html/builds/pypy-c-" + uploadSuffix)
+
+#         if pytestArguments is not None:
+#             self.addStep(
+#                 self.PyTestStep,
+#                 testPackage="pypy",
+#                 testArguments=pytestArguments,
+#                 timeout=60 * 60)
+
+#             self.addStep(
+#                 self.PyTestStep,
+#                 python="pypy/translator/goal/pypy-c",
+#                 testPackage="pypy",
+#                 # Exclude --boxed if it was specified, because -A shouldn't
+#                 # really use much memory.
+#                 testArguments=["-A"] + list(arg for arg in pytestArguments if arg != "--boxed"),
+#                 timeout=60 * 60)
+
 #         self.addStep(
 #             SVN,
 #             workdir="build/Twisted-src",
 #             svnurl="svn://svn.twistedmatrix.com/svn/Twisted/trunk",
 #             mode="copy")
-# 
+
 #         self.addStep(
 #             Trial,
 #             workdir="build/pypy-src/pypy/translator/goal",
@@ -181,3 +184,4 @@
 
 class WindowsPyPyBuildFactory(PyPyBuildFactory):
     PyTestStep = WindowsPyTest
+    executable = "pypy-c.exe"



More information about the Pypy-commit mailing list