| Index: scripts/master/factory/v8_factory.py
|
| ===================================================================
|
| --- scripts/master/factory/v8_factory.py (revision 63686)
|
| +++ scripts/master/factory/v8_factory.py (working copy)
|
| @@ -23,17 +23,23 @@
|
| '/deps/third_party/python_24')
|
|
|
| CUSTOM_DEPS_ES5CONFORM = ('bleeding_edge/test/es5conform/data',
|
| - 'https://es5conform.svn.codeplex.com/svn@62998')
|
| + 'https://es5conform.svn.codeplex.com/svn@71525')
|
|
|
| CUSTOM_DEPS_SPUTNIK = ('bleeding_edge/test/sputnik/sputniktests',
|
| 'http://sputniktests.googlecode.com/svn/trunk@28')
|
|
|
| CUSTOM_DEPS_SCONS = ('third_party/scons',
|
| - 'svn://chrome-svn.corp.google.com/chrome/trunk/src/third_party/scons')
|
| + config.Master.trunk_url +
|
| + '/src/third_party/scons')
|
|
|
| CUSTOM_DEPS_VALGRIND = ('src/third_party/valgrind',
|
| - config.Master.trunk_url + '/deps/third_party/valgrind/binaries')
|
| + config.Master.trunk_url +
|
| + '/deps/third_party/valgrind/binaries')
|
|
|
| + CUSTOM_DEPS_WIN7SDK = ('third_party/win7sdk',
|
| + config.Master.trunk_internal_url +
|
| + '/third_party/platformsdk_win7/files')
|
| +
|
| CUSTOM_DEPS_MOZILLA = ('bleeding_edge/test/mozilla/data',
|
| config.Master.trunk_url +
|
| '/deps/third_party/mozilla-tests')
|
| @@ -46,8 +52,8 @@
|
| gclient_factory.GClientFactory.__init__(self, build_dir, custom_deps_list,
|
| target_platform=target_platform)
|
|
|
| - @staticmethod
|
| - def _AddTests(factory_cmd_obj, tests, mode=None,
|
| +
|
| + def _AddTests(self, factory_cmd_obj, tests, mode=None,
|
| factory_properties=None):
|
| """Add the tests listed in 'tests' to the factory_cmd_obj."""
|
| factory_properties = factory_properties or {}
|
| @@ -61,18 +67,24 @@
|
| if R('presubmit'): f.AddPresubmitTest()
|
| if R('v8testing'): f.AddV8Testing()
|
| if R('v8_es5conform'): f.AddV8ES5Conform()
|
| + if R('fuzz'): f.AddFuzzer()
|
|
|
| # Mozilla tests should be moved to v8 repo
|
| if R('mozilla'):
|
| f.AddV8Mozilla()
|
|
|
| if R('sputnik'): f.AddV8Sputnik()
|
| - if R('arm'): f.AddArmSimTest()
|
| + if R('arm'):
|
| + f.AddV8Testing(simulator='arm')
|
| + f.AddV8ES5Conform(simulator='arm')
|
| + f.AddV8Mozilla(simulator='arm')
|
| + f.AddV8Sputnik(simulator='arm')
|
|
|
| +
|
| def V8Factory(self, identifier, target='release', clobber=False,
|
| tests=None, mode=None, slave_type='BuilderTester',
|
| options=None, compile_timeout=1200, build_url=None,
|
| - project=None, factory_properties=None):
|
| + project=None, factory_properties=None, target_arch=None):
|
| tests = tests or []
|
| factory_properties = factory_properties or {}
|
|
|
| @@ -82,6 +94,7 @@
|
| # If we are on win32 add extra python executable
|
| if (self._target_platform == 'win32'):
|
| self._solutions[0].custom_deps_list.append(self.CUSTOM_DEPS_PYTHON)
|
| + self._solutions[0].custom_deps_list.append(self.CUSTOM_DEPS_WIN7SDK)
|
|
|
| if (gclient_factory.ShouldRunTest(tests, 'v8_es5conform')):
|
| self._solutions[0].custom_deps_list.append(self.CUSTOM_DEPS_ES5CONFORM)
|
| @@ -95,6 +108,11 @@
|
| if (gclient_factory.ShouldRunTest(tests, 'mozilla')):
|
| self._solutions[0].custom_deps_list.append(self.CUSTOM_DEPS_MOZILLA)
|
|
|
| + if (gclient_factory.ShouldRunTest(tests, 'arm')):
|
| + self._solutions[0].custom_deps_list.append(self.CUSTOM_DEPS_MOZILLA)
|
| + self._solutions[0].custom_deps_list.append(self.CUSTOM_DEPS_SPUTNIK)
|
| + self._solutions[0].custom_deps_list.append(self.CUSTOM_DEPS_ES5CONFORM)
|
| +
|
| factory = self.BuildFactory(identifier, target, clobber, tests, mode,
|
| slave_type, options, compile_timeout, build_url,
|
| project, factory_properties)
|
| @@ -104,7 +122,15 @@
|
| v8_cmd_obj = v8_commands.V8Commands(factory, identifier,
|
| target,
|
| '',
|
| - self._target_platform)
|
| + self._target_platform,
|
| + target_arch)
|
| + if factory_properties.get('archive_build'):
|
| + v8_cmd_obj.AddArchiveBuild(
|
| + extra_archive_paths=factory_properties.get('extra_archive_paths'))
|
| +
|
| + if (slave_type == 'Tester'):
|
| + v8_cmd_obj.AddMoveExtracted()
|
| +
|
| # Add all the tests.
|
| self._AddTests(v8_cmd_obj, tests, mode, factory_properties)
|
| return factory
|
|
|