Switch package waterfall to use package spec file, not package root.

annotated_steps.py

 #!/usr/bin/python
 
 # Copyright (c) 2014, 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 imp
 import os
 import re
 import shutil
@@ skipping 160 matching lines @@
     local_zip = os.path.join(build_root, 'sdk.zip')
     gsutils = bot_utils.GSUtil()
     gsutils.execute(['cp',
                     namer.sdk_zipfilepath('latest', bot_info.system,
                                           'ia32', 'release'),
                     local_zip])
     if bot_info.system == 'windows':
       with zipfile.ZipFile(local_zip, 'r') as zip_file:
         zip_file.extractall(path=build_root)
     else:
-      # We don't keep the execution bit if we use python's zipfile on possix.
+      # We don't keep the execution bit if we use python's zipfile on posix.
       RunProcess(['unzip', local_zip, '-d', build_root])
     pub = GetPub(bot_info)
     RunProcess([pub, '--version'])
 
 def GetPackagePath(bot_info):
   if bot_info.is_repo:
     return os.path.join('pkg', bot_info.package_name)
   return os.path.join('third_party', 'pkg', bot_info.package_name)
 
 def GetBuildRoot(bot_info):
@@ skipping 68 matching lines @@
           print '- ok:  ' if exists else '- bad: ',
           print os.path.join(package, 'lib', 'unittest.dart')
       print ''
 
 def RunPubUpgrade(bot_info, path):
   pub = GetPub(bot_info)
   extra_env = GetPubEnv(bot_info)
   with BuildStep('Pub upgrade'):
     # For now, assume pub
     with ChangedWorkingDirectory(path):
-      args = [pub, 'upgrade']
+      args = [pub, 'upgrade', '--no-package-symlinks']
       RunProcess(args, extra_env=extra_env)
 
 def RunPubBuild(bot_info, path, folder, mode=None):
   skip_pub_build = ['dart-protobuf', 'rpc']
   with BuildStep('Pub build on %s' % folder):
     if bot_info.package_name in skip_pub_build:
       print "Not running pub build"
       return
     pub = GetPub(bot_info)
     extra_env = GetPubEnv(bot_info)
@@ skipping 32 matching lines @@
   if is_first_test_run:
     is_first_test_run = False
     return []
   return ['--append_logs']
 
 def RunPackageTesting(bot_info, package_path, folder='test'):
   package_name = os.path.basename(package_path)
   if package_name == '':
     # when package_path had a trailing slash
     package_name = os.path.basename(os.path.dirname(package_path))
-  package_root = os.path.join(package_path, folder, 'packages')
+  package_spec_file = os.path.join(package_path, folder, '.packages')
 
   # Note: we use package_name/package_name/folder and not package_name/folder on

[mit, 2016/08/12 12:02:31]

Should update this comment

[Bill Hesse, 2016/08/12 12:06:00]

The comment does not apply to the changed package path, but to the final
argument to test.py, which is the test selector and filter.

   # purpose. The first package_name denotes the suite, the second is part of the
   # path we want to match. Without the second package_name, we may match tests
   # that contain "folder" further down. So if folder is "test",
   # "package_name/test" matches "package_name/build/test", but
   # "package_name/package_name/test" does not.
   standard_args = ['--arch=ia32',
                    '--suite-dir=%s' % package_path,
                    '--use-sdk', '--report', '--progress=buildbot',
                    '--clear_browser_cache',
-                   '--package-root=%s' % package_root,
+                   '--packages=%s' % package_spec_file,
                    '--write-debug-log', '-v',
                    '--time',
                    '%s/%s/%s/' % (package_name, package_name, folder)]
   suffix = ' under build' if folder == 'build/test' else ''
   with BuildStep('Test vm release mode%s' % suffix, swallow_error=True):
     args = [sys.executable, 'tools/test.py',
             '-mrelease', '-rvm', '-cnone'] + standard_args
     args.extend(LogsArgument())
     # For easy integration testing we give access to the sdk bin directory.
     # This only makes sense on vm testing.
@@ skipping 28 matching lines @@
       raise Exception("Unknown magic marker %s. Known mappings are: %s" %
                       (word, replacements))
     return replacements[word]
   return re.sub(r"\$(\w+)", replace, v)
 
 def RunTestRunner(bot_info, test_package, package_path):
   package_name = os.path.basename(package_path)
   if package_name == '':
     # when package_path had a trailing slash
     package_name = os.path.basename(os.path.dirname(package_path))
-  package_root = os.path.join(package_path, 'packages')
 
   pub = GetPub(bot_info)
   extra_env = GetPubEnv(bot_info)
   with BuildStep('pub run test', swallow_error=True):
     # TODO(nweiz): include dartium here once sdk#23816 is fixed.
     platforms = set(['vm', 'chrome', 'firefox'])
     if bot_info.system == 'windows':
       platforms.add('ie')
       # TODO(nweiz): remove dartium here once sdk#23816 is fixed.
     elif bot_info.system == 'mac':
@@ skipping 103 matching lines @@
     'dart': utils.CheckedInSdkExecutable(),
     'project_root': copy_path,
     'python': sys.executable
   }
 
   RunCustomScript(test_config) or \
     RunDefaultScript(bot_info, test_config, copy_path)
 
 if __name__ == '__main__':
   main()