Minor code clean-ups addressing Nicolas suggestions

tools/testing/architecture.py

 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 #
 
 import os
 import platform
 import re
 import shutil
 import subprocess
@@ skipping 373 matching lines @@
     super(FrogChromiumArchitecture, 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'))
-    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
 
 
 class DartiumArchitecture(BrowserArchitecture):
   """Architecture that runs dart in an VM embedded in DumpRenderTree."""
 
   def __init__(self, root_path, arch, mode, component, test):
     super(DartiumArchitecture, self).__init__(root_path, arch, mode, component, test)
 
   def GetScriptType(self):
     return 'application/dart'
 
   def GetScriptPath(self):
     return 'file:///' + self.GetTestScriptFile()
 
   def GetHtmlName(self):
     path = os.path.relpath(self.test, self.root_path).replace(os.sep, '_')
     return path + '.dartium.html'
 
   def GetCompileCommand(self, fatal_static_type_errors=False):
     fatal_static_type_errors = fatal_static_type_errors  # shutup lint!
     return None
 
   def Compile(self):
     return 0
 
 
-class WebDriverArchiecture(ChromiumArchitecture):
+class WebDriverArchiecture(FrogChromiumArchitecture):
   """Architecture that runs compiled dart->JS (via frog) through a variety of
   real browsers using WebDriver."""
 
   def __init__(self, root_path, arch, mode, component, test):
     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',
                                 'run_selenium.py')
     
     html_output_file = os.path.join(self.GetHtmlPath(), self.GetHtmlName())
     f = open(html_output_file, 'w')
     f.write(self.GetHtmlContents())
     f.close()
     return [selenium_location, html_output_file]
@@ skipping 109 matching lines @@
     return WebDriverArchiecture(root_path, arch, mode, component, test)
 
   elif component in ['vm', 'frog', 'frogsh']:
     return StandaloneArchitecture(root_path, arch, mode, component, test)
 
   elif component == 'leg':
     return LegArchitecture(root_path, arch, mode, component, test)
 
   elif component == 'dartc':
     return DartcArchitecture(root_path, arch, mode, component, test)