Index: tools/bots/pub.py |
diff --git a/tools/bots/pub.py b/tools/bots/pub.py |
index ee3cd1e74f2d2ccdb77215f7837eb1e9011fcbb7..cdd8a8b2b975934204c27c2cfc03d1eeedc5aca9 100755 |
--- a/tools/bots/pub.py |
+++ b/tools/bots/pub.py |
@@ -12,15 +12,8 @@ Runs tests for pub and the pub packages that are hosted in the main Dart repo. |
import os |
import re |
-import shutil |
-import sys |
import bot |
-import bot_utils |
- |
-utils = bot_utils.GetUtils() |
- |
-BUILD_OS = utils.GuessOS() |
PUB_BUILDER = r'pub-(linux|mac|win)' |
@@ -42,34 +35,11 @@ def PubConfig(name, is_buildbot): |
return bot.BuildInfo('none', 'vm', mode, system, checked=True) |
-def Run(command): |
- print "Running %s" % ' '.join(command) |
- return bot.RunProcess(command) |
- |
def PubSteps(build_info): |
- sdk_bin = os.path.join( |
- bot_utils.DART_DIR, |
- utils.GetBuildSdkBin(BUILD_OS, build_info.mode, build_info.arch)) |
- pub_script_name = 'pub.bat' if build_info.system == 'windows' else 'pub' |
- pub_bin = os.path.join(sdk_bin, pub_script_name) |
- |
- pub_copy = os.path.join(utils.GetBuildRoot(BUILD_OS), 'pub_copy') |
pub_location = os.path.join('third_party', 'pkg', 'pub') |
- with bot.BuildStep('Make copy of pub for testing'): |
- print 'Removing old copy %s' % pub_copy |
- shutil.rmtree(pub_copy, ignore_errors=True) |
- print 'Copying %s to %s' % (pub_location, pub_copy) |
- shutil.copytree(pub_location, pub_copy) |
- |
- # TODO(nweiz): add logic for testing pub. |
- with bot.BuildStep('Doing the magic ls'): |
- with utils.ChangedWorkingDirectory(pub_copy): |
- Run(['ls', '-l']) |
- |
- with bot.BuildStep('Running pub'): |
- Run([pub_bin, '--version']) |
- |
+ with bot.BuildStep('Running pub tests'): |
+ bot.RunTestRunner(build_info, pub_location) |
if __name__ == '__main__': |
bot.RunBot(PubConfig, PubSteps) |