Update annotated steps to run tests with a valid 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 284 matching lines @@
     shutil.copy(dart_controller, test_controller)
   else:
     print "No unittest to patch, do you even have tests"
 
 JS_RUNTIMES = {
   'windows': ['ff', 'chrome', 'ie10'],
   'linux': ['d8', 'jsshell', 'ff', 'chrome'],
   'mac': ['safari'],
 }
 
-def RunPackageTesting(bot_info, package_path):
-  package_root = os.path.join(package_path, 'packages')
+def RunPackageTesting(bot_info, package_path, folder='test'):
+  package_name = os.path.basename(os.path.dirname(package_path))
+  package_root = os.path.join(package_path, folder, 'packages')
   standard_args = ['--suite-dir=%s' % package_path,
                    '--use-sdk', '--report', '--progress=buildbot',
                    '--clear_browser_cache',
                    '--package-root=%s' % package_root,
                    '--write-debug-log', '-v',
-                   '--time']
+                   '--time',
+                   '%s/%s/%s/' % (package_name, package_name, folder)]
   system = bot_info.system
   xvfb_command = ['xvfb-run', '-a', '--server-args=-screen 0 1024x768x24']
   xvfb_args =  xvfb_command if system == 'linux' else []
   with BuildStep('Test vm release mode', swallow_error=True):
     args = [sys.executable, 'tools/test.py',
             '-mrelease', '-rvm', '-cnone'] + standard_args
     RunProcess(args)
   if bot_info.system != 'windows':
     with BuildStep('Test dartium', swallow_error=True):
       test_args = [sys.executable, 'tools/test.py',
@@ skipping 39 matching lines @@
   print 'Running testing in copy of package in %s' % copy_path
   RunPrePubUpgradeHooks(test_config)
   RunPubUpgrade(bot_info, copy_path)
 
   RunPrePubBuildHooks(test_config)
   RunPubBuild(bot_info, copy_path, 'web')
   RunPubBuild(bot_info, copy_path, 'test', 'debug')
   FixupTestControllerJS(copy_path)
 
   RunPreTestHooks(test_config)
-  RunPackageTesting(bot_info, copy_path)
+  RunPackageTesting(bot_info, copy_path, 'test')
+  RunPackageTesting(bot_info, copy_path, 'build/test')
   RunPostTestHooks(test_config)