Revert "ios: fix path to the test app"

scripts/slave/recipe_modules/ios/api.py

 # Copyright 2015 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.
 
 import copy
 
 from recipe_engine import recipe_api
 
 
 class iOSApi(recipe_api.RecipeApi):
@@ skipping 373 matching lines @@
       *args: Any additional arguments to pass to the test harness.
     """
     assert self.__config is not None
     test_failures = []
     infrastructure_failures = []
 
     for test in self.__config['tests']:
       cmd = [
         self.package_repo_resource(
           'scripts', 'slave', 'ios', 'run.py'),
-        '--app', self.m.path.join(
+        '--app', self.m.path['slave_build'].join(
           self.most_recent_app_dir,
           '%s.app' % test['app'],
         ),
         '--json_file', self.m.json.output(),
       ]
       if test.get('xctest'):
         cmd.extend([
           '--test-host', test['app'],
           '--dummyproj', self.package_repo_resource(
             'scripts', 'slave', 'ios', 'TestProject', 'TestProject.xcodeproj'),
         ])
 
       step_name = test['app']
 
       if self.platform == 'simulator':
         cmd.extend([
-          '--iossim', self.most_recent_iossim,
+          '--iossim', self.m.path['slave_build'].join(self.most_recent_iossim),
           '--platform', test['device type'],
           '--version', test['os'],
         ])
 
         # Since we may be running simulator tests on multiple platforms,
         # include the platform and OS in the name of the step.
         step_name = '%s (%s iOS %s)' % (
           test['app'],
           test['device type'],
           test['os'],
@@ skipping 78 matching lines @@
       '--out-dir', '${ISOLATED_OUTDIR}',
       '--xcode-version', '<(xcode_version)',
     ]
     files = [
       # .apps are directories. Need the trailing slash to isolate the
       # contents of a directory.
       '<(app_path)/',
       'src/ios/build/bots/scripts/',
     ]
     if self.platform == 'simulator':
-      iossim = self.most_recent_iossim
+      iossim = self.m.path.join(self.most_recent_iossim)
       cmd.extend([
         '--iossim', iossim,
         '--platform', '<(platform)',
         '--version', '<(version)',
       ])
       files.append(iossim)
     isolate_template_contents = {
       'conditions': [
         ['OS == "ios"', {
           'variables': {
@@ skipping 197 matching lines @@
     build_dir = {
       'xcodebuild': 'xcodebuild',
       'ninja': 'out',
     }[self.compiler]
 
     platform = {
       'device': 'iphoneos',
       'simulator': 'iphonesimulator',
     }[self.platform]
 
-    return self.m.path['checkout'].join(
+    return self.m.path.join(
+      'src',
       build_dir,
       '%s-%s' % (self.configuration, platform),
     )
 
   @property
   def most_recent_iossim(self):
     """Returns the path to the most recently compiled iossim."""
     build_dir = {
       'xcodebuild': self.m.path.join('xcodebuild', 'ninja-iossim'),
       'ninja': 'out',
@@ skipping 11 matching lines @@
     # out/Debug-iphonesimulator/iossim
     # out/Release-iphoneos/iossim
     # out/Release-iphonesimulator/iossim
 
     platform = {
       'device': 'iphoneos',
       'simulator': 'iphonesimulator',
     }[self.platform]
 
     return {
-      'xcodebuild': self.m.path['checkout'].join(
+      'xcodebuild': self.m.path.join(
+        'src',
         build_dir,
         self.configuration,
         'iossim',
       ),
-      'ninja': self.m.path['checkout'].join(
+      'ninja': self.m.path.join(
+        'src',
          build_dir,
          '%s-%s' % (self.configuration, platform),
          'iossim',
       ),
     }[self.compiler]