Change clobbering to use the new script inside the dart tools directory.

utils/compiler/buildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
 """Dart2js buildbot steps
 
 Runs tests for the  dart2js compiler.
 """
@@ skipping 199 matching lines @@
   if system == 'linux' and runtime == 'chrome':
     # TODO(ngeoffray): We should install selenium on the buildbot.
     runtime = 'drt'
   elif (runtime == 'ff' or runtime == 'chrome') and is_buildbot:
     # Print out browser version numbers if we're running on the buildbot (where
     # we know the paths to these browser installations).
     version_query_string = '"%s" --version' % GetPath(runtime)
     if runtime == 'ff' and system == 'win7':
       version_query_string += '| more'
     elif runtime == 'chrome' and system == 'win7':
-      version_query_string = ('''reg query "HKCU\\Software\\Microsoft\\''' + 
+      version_query_string = ('''reg query "HKCU\\Software\\Microsoft\\''' +
           '''Windows\\CurrentVersion\\Uninstall\\Google Chrome" /v Version''')
     p = subprocess.Popen(version_query_string,
         stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     output, stderr = p.communicate()
     output = output.split()
     try:
       print 'Version of %s: %s' % (runtime, output[-1])
     except IndexError:
       # Failed to obtain version information. Continue running tests.
       pass
@@ skipping 55 matching lines @@
   if system == 'win7':
     shutil.rmtree('C:\\Users\\chrome-bot\\AppData\\Local\\Temp',
         ignore_errors=True)
   elif browser == 'ff':
     # Note: the buildbots run as root, so we can do this without requiring a
     # password. The command won't actually work on regular machines without
     # root permissions.
     _DeleteFirefoxProfiles('/tmp')
     _DeleteFirefoxProfiles('/var/tmp')
 
-def MaybeClobber(runtime, mode, system):
-  """ Clobber the build directory if the clobber flag has been set.
+def ClobberBuilder(mode):
+  """ Clobber the builder before we do the build.
   Args:
-     - runtime: either 'd8', or one of the browsers, see GetBuildInfo
      - mode: either 'debug' or 'release'
-     - system: either 'linux', 'mac', or 'win7'
   """
-  builder_clobber = os.environ.get(BUILDER_CLOBBER)
-  if (builder_clobber != "1"):
-    print "Clobber flag not set, not clobbering"
-    return
+  cmd = [sys.executable,
+         './tools/clean_output_directory.py',
+         '--mode=' + mode]
+  print 'Clobbering %s' % (' '.join(cmd))
+  return subprocess.call(cmd, env=NO_COLOR_ENV)
 
-  # TODO(ricow): add support for browser bots - sync with Emily
-  if (runtime == "d8"):
-    delete_path = os.path.join(DART_PATH, "out")
-    print "Clobbering %s" % (delete_path)
-    shutil.rmtree("", ignore_errors=True);
+def GetShouldClobber():
+  if os.environ.get(BUILDER_CLOBBER) == "1":

[ahe, 2012/08/14 17:57:20]

return os.environ.get(BUILDER_CLOBBER) == "1"

+    return True
+  else:
+    return False
 
 def main():
-
   if len(sys.argv) == 0:
     print 'Script pathname not known, giving up.'
     return 1
 
   (compiler, runtime, mode, system, option, shard_index, total_shards,
       is_buildbot) = GetBuildInfo()
   shard_description = ""
   if shard_index:
     shard_description = " shard %s of %s" % (shard_index, total_shards)
   print "compiler: %s, runtime: %s mode: %s, system: %s, option: %s%s" % (
       compiler, runtime, mode, system, option, shard_description)
   if compiler is None:
     return 1
 
-  print '@@@BUILD_STEP Maybe clobber@@@'
-  MaybeClobber(runtime, mode, system)
+  if GetShouldClobber():
+    print '@@@BUILD_STEP Clobber@@@'
+    status = ClobberBuilder(mode)
+    if status != 0:
+      print '@@@STEP_FAILURE@@@'
+      return status
 
   print '@@@BUILD_STEP build sdk@@@'
   status = BuildSDK(mode, system)
   if status != 0:
     print '@@@STEP_FAILURE@@@'
     return status
 
   test_flags = []
   if shard_index:
     test_flags = ['--shards=%s' % total_shards, '--shard=%s' % shard_index]
 
   # First we run all the regular tests.
   status = TestCompiler(runtime, mode, system, option, test_flags,
                         is_buildbot)
 
   # We only run checked mode tests when the host is not in checked mode.
   if status == 0 and option != 'checked' and runtime == 'd8':
     status = TestCompiler(runtime, mode, system, option,
                           test_flags + ['--checked'], is_buildbot)
 
   if runtime != 'd8': CleanUpTemporaryFiles(system, runtime)
   if status != 0: print '@@@STEP_FAILURE@@@'
   return status
 
 if __name__ == '__main__':
   sys.exit(main())