Final changes to get PyAuto official happy with Mac and Win. Use...

factory/chromium_factory.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility class to build the chromium master BuildFactory's.
 
 Based on gclient_factory.py and adds chromium-specific steps."""
 
 import os
@@ skipping 242 matching lines @@
       prefix = 'wine_valgrind_'
       if test.startswith(prefix):
         test_name = test[len(prefix):]
         f.AddWineValgrindTest(test_name)
 
 
     # PyAuto functional tests.
     if R('pyauto_functional_tests'):
       f.AddPyAutoFunctionalTest('pyauto_functional_tests')
     elif R('pyauto_official_tests'):
-      # Mapping from self._target_platform to a chrome-*.zip
-      platmap = {'win32': 'win',
-                 'darwin': 'mac',
-                 'linux2': 'linux' }
-      zip_plat = platmap[self._target_platform]
-      workdir = os.path.join(f._working_dir, 'chrome-' + zip_plat)
       f.AddPyAutoFunctionalTest('pyauto_functional_tests',
-                                functional_base='..',
-                                workdir=workdir)
+                                workdir=f._working_dir)
 
     # When adding a test that uses a new executable, update kill_processes.py.
 
     # Coverage tests.  Add coverage processing absoluely last, after
     # all tests have run.  Tests which run after coverage processing
     # don't get counted.
     if R('run_coverage_bundles'):
       f.AddRunCoverageBundles(fp)
     if R('process_coverage'):
       f.AddProcessCoverage(fp)
@@ skipping 216 matching lines @@
     factory = self.BuildFactory(identifier, target, clobber, tests, mode,
                                 slave_type, options, compile_timeout, build_url,
                                 project, factory_properties)
     chromium_cmd_obj = chromium_commands.ChromiumCommands(factory, identifier,
                                                           target,
                                                           self._build_dir,
                                                           self._target_platform)
     chromium_cmd_obj.AddDownloadAndExtractOfficialBuild(identifier)
     self._AddTests(chromium_cmd_obj, tests, mode, factory_properties)
     return factory