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

[fijal at codespeak.net]

Author: fijal
Date: Tue Mar  9 01:07:19 2010
New Revision: 71940

Modified:
   pypy/build/bot2/pypybuildbot/builds.py
   pypy/build/bot2/pypybuildbot/master.py
Log:
remove maemo build - it seems without a real device it's pointless and nobody
cared about setting up a real device enough


Modified: pypy/build/bot2/pypybuildbot/builds.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/builds.py	(original)
+++ pypy/build/bot2/pypybuildbot/builds.py	Tue Mar  9 01:07:19 2010
@@ -161,31 +161,3 @@
             description="run benchmarks 1",
             command=["python", "pypy/translator/benchmark/jitbench.py",
                      "pypy/translator/goal/pypy-c"]))
-
-# xxx keep style
-class TranslatedScratchbox(factory.BuildFactory):
-    def __init__(self, *a, **kw):
-        USERNAME = 'buildbot'
-        WORKDIR = '/scratchbox/users/%s/home/%s/build' % (USERNAME, USERNAME)
-        
-        factory.BuildFactory.__init__(self, *a, **kw)
-        platform = kw.pop('platform', 'linux')
-        setup_steps(platform, self, WORKDIR)
-        workdir = os.path.join(WORKDIR, 'pypy', 'translator', 'goal')
-
-        self.addStep(Translate(["--platform", "maemo", "--gc=hybrid", "-Omem"],
-                               [], workdir=workdir))
-        
-        #self.addStep(ShellCmd(
-        #    description="app-level (-A) test",
-        #    command=["python", "testrunner/scratchbox_runner.py",
-        #             "--logfile=pytest-A.log",
-        #             "--config=pypy/pytest-A.cfg",
-        #             "--root=pypy", "--timeout=1800"],
-        #    logfiles={'pytestLog': 'pytest-A.log'},
-        #    timeout = 4000,
-        #    workdir = WORKDIR,
-        #    env={"PYTHONPATH": ['.']}))
-        self.addStep(ShellCmd(
-            description="copy build",
-            command=["scp", "pypy-c", "fijal at codespeak.net:builds/pypy-c-scratchbox"], workdir = workdir))

Modified: pypy/build/bot2/pypybuildbot/master.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/master.py	(original)
+++ pypy/build/bot2/pypybuildbot/master.py	Tue Mar  9 01:07:19 2010
@@ -44,7 +44,7 @@
                                             'stackless',
                                             'windows', 'mac',
                                             'benchmark-run',
-                                            'maemo', 'other']))
+                                            'other']))
 
 
 pypybuilds = load('pypybuildbot.builds')
@@ -97,9 +97,6 @@
 
 pypyJITBenchmarkFactory = pypybuilds.JITBenchmark()
 
-pypyTranslatedLibPythonMaemoTestFactory = pypybuilds.TranslatedScratchbox()
-
-
 LINUX32 = "own-linux-x86-32"
 MACOSX32 =  "own-macosx-x86-32"
 APPLVLLINUX32 = "pypy-c-app-level-linux-x86-32"
@@ -116,8 +113,6 @@
 JITONLYLINUX32 = "jitonly-own-linux-x86-32"
 JITBENCH = "jit-benchmark-linux-x86-32"
 
-BUILDMAEMO = "pypy-c-maemo-build"
-
 BuildmasterConfig = {
     'slavePortnum': slavePortnum,
 
@@ -175,12 +170,6 @@
                    "factory": pypyTranslatedAppLevelTestFactoryWin,
                    "category": "windows"
                   },
-                  {"name" : BUILDMAEMO,
-                   "slavenames": ['bigdogvm1'],
-                   "builddir" : BUILDMAEMO,
-                   "factory": pypyTranslatedLibPythonMaemoTestFactory,
-                   "category": 'maemo'
-                   },
                   {"name" : APPLVLFREEBSD64,
                    "slavenames": ['headless'],
                    'builddir' : APPLVLFREEBSD64,