Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: tools/testing/architecture.py

Issue 8491052: Minor code clean-ups addressing Nicolas suggestions (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/testing/architecture.py
diff --git a/tools/testing/architecture.py b/tools/testing/architecture.py
index 7c924e8dcadd92a67c29043408da36327b6da310..a586958d44673ffb2f277d7a0fa0f0f2889e4573 100755
--- a/tools/testing/architecture.py
+++ b/tools/testing/architecture.py
@@ -391,9 +391,11 @@ class FrogChromiumArchitecture(ChromiumArchitecture):
# in a temporary directory.
frog = os.path.abspath(utils.GetDartRunner(self.mode, self.arch, 'frogsh'))
- cmd = [frog, '--out=' + self.GetScriptPath(), '--compile-only',
- '--libdir=' + os.path.abspath(
- os.path.join(self.root_path, 'frog', 'lib'))]
+ frog_libdir = os.path.abspath(os.path.join(self.root_path, 'frog', 'lib'))
+ cmd = [frog,
+ '--libdir=%s' % frog_libdir,
+ '--compile-only',
+ '--out=%s' % self.GetScriptPath()]
cmd.extend(self.vm_options)
cmd.append(self.GetTestScriptFile())
return cmd
@@ -423,7 +425,7 @@ class DartiumArchitecture(BrowserArchitecture):
return 0
-class WebDriverArchiecture(ChromiumArchitecture):
+class WebDriverArchiecture(FrogChromiumArchitecture):
"""Architecture that runs compiled dart->JS (via frog) through a variety of
real browsers using WebDriver."""
@@ -431,18 +433,6 @@ class WebDriverArchiecture(ChromiumArchitecture):
super(WebDriverArchiecture, self).__init__(root_path, arch, mode,
component, test)
- def GetCompileCommand(self, fatal_static_type_errors=False):
- """Returns cmdline as an array to invoke the compiler on this test."""
- # We need an absolute path because the compilation will run
- # in a temporary directory.
- frog = os.path.abspath(utils.GetDartRunner(self.mode, self.arch, 'frogsh'))
- build_root = utils.GetBuildRoot(OS_GUESS, self.mode, 'ia32')
- cmd = [frog, '--libdir=%s' % os.path.abspath(os.path.join(self.root_path,
- 'frog', 'lib')), '--compile-only',
- '--out=%s' % self.GetScriptPath()]
- cmd.append(self.GetTestScriptFile())
- return cmd
-
def GetRunCommand(self, fatal_static_type_errors=False):
"""Returns a command line to execute for the test."""
selenium_location = os.path.join(self.root_path, 'tools', 'testing',
« frog/scripts/buildbot_annotated_steps.py ('K') | « frog/scripts/buildbot_annotated_steps.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698