fix bench rebase tool to cope with wider range of bots.

experimental/benchtools/rebase.py

 #!/usr/bin/env python
 # Copyright (c) 2014 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.
 
 
 """rebase.py: standalone script to batch update bench expectations.
 
     Requires gsutil to access gs://chromium-skia-gm and Rietveld credentials.
 
@@ skipping 66 matching lines @@
   out, err = proc.communicate()
   if err:
     clean_dir(gs_dir)
     return False
   files = 0
   for f in os.listdir(os.path.join(gs_dir, p)):
     if filter_file(f):
       os.remove(os.path.join(gs_dir, p, f))
     else:
       files += 1
-  if files == 4:
+  if files:
     return True
   return False
 
 def calc_expectations(p, h, gs_dir, exp_dir, repo_dir):
   exp_filename = 'bench_expectations_%s.txt' % p
   proc = subprocess.Popen(['python', 'skia/bench/gen_bench_expectations.py',
       '-r', h, '-b', p, '-d', os.path.join(gs_dir, p), '-o',
           os.path.join(exp_dir, exp_filename)],
               stdout=subprocess.PIPE)
   out, err = proc.communicate()
@@ skipping 115 matching lines @@
   ts_str = '%s' % time.time()
   gs_dir = os.path.join(d, 'gs' + ts_str)
   exp_dir = os.path.join(d, 'exp' + ts_str)
   clean_dir(gs_dir)
   clean_dir(exp_dir)
   for p in PLATFORMS:
     clean_dir(os.path.join(gs_dir, p))
     hash_to_use = ''
     for h in reversed(hashes):
       li = get_gs_filelist(p, h)
-      if len(li) != 4:  # no or partial data
+      if not len(li):  # no data
         continue
       if download_gs_files(p, h, gs_dir):
         print 'Copied %s/%s' % (p, h)
         hash_to_use = h
         break
       else:
         print 'DOWNLOAD BENCH FAILED %s/%s' % (p, h)
         break
     if hash_to_use:
       if calc_expectations(p, h, gs_dir, exp_dir, repo_dir):
         update_li.append('bench_expectations_%s.txt' % p)
   if not update_li:
     print 'No bench data to update after %s!' % args.githash
   elif not git_commit_expectations(
       repo_dir, exp_dir, update_li, args.githash[:7], commit):
     print 'ERROR uploading expectations using git.'
   elif not commit:
     print 'CL created. Please take a look at the link above.'
   else:
     print 'New bench baselines should be in CQ now.'
   delete_dirs([gs_dir, exp_dir])
 
 
 if __name__ == "__main__":
   main()