[test] Pull benchmarks as a dependency.

test/benchmarks/testcfg.py

 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 10 matching lines @@
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 import os
 import shutil
-import subprocess
-import tarfile
 
 from testrunner.local import statusfile
 from testrunner.local import testsuite
 from testrunner.objects import testcase
 
 
 class BenchmarksVariantGenerator(testsuite.VariantGenerator):
   # Both --nocrankshaft and --stressopt are very slow. Add TF but without
   # always opt to match the way the benchmarks are run for performance
   # testing.
   def FilterVariantsByTest(self, testcase):
     if testcase.outcomes and statusfile.OnlyStandardVariant(
         testcase.outcomes):
       return self.standard_variant
     return self.fast_variants
 
   def GetFlagSets(self, testcase, variant):
     return testsuite.FAST_VARIANT_FLAGS[variant]
 
 
 class BenchmarksTestSuite(testsuite.TestSuite):
 
   def __init__(self, name, root):
     super(BenchmarksTestSuite, self).__init__(name, root)
-    self.testroot = root
+    self.testroot = os.path.join(root, "data")
 
   def ListTests(self, context):
     tests = []
     for test in [
         "kraken/ai-astar",
         "kraken/audio-beat-detection",
         "kraken/audio-dft",
         "kraken/audio-fft",
         "kraken/audio-oscillator",
         "kraken/imaging-darkroom",
@@ skipping 71 matching lines @@
       result += ["-e", "BenchmarkSuite.RunSuites({});"]
     elif testcase.path.startswith("sunspider"):
       result.append(os.path.join(self.testroot, "%s.js" % testcase.path))
     return testcase.flags + result
 
   def GetSourceForTest(self, testcase):
     filename = os.path.join(self.testroot, testcase.path + ".js")
     with open(filename) as f:
       return f.read()
 
-  def _DownloadIfNecessary(self, url, revision, target_dir):
-    # Maybe we're still up to date?
-    revision_file = "CHECKED_OUT_%s" % target_dir
-    checked_out_revision = None
-    if os.path.exists(revision_file):
-      with open(revision_file) as f:
-        checked_out_revision = f.read()
-    if checked_out_revision == revision:
-      return
+  def DownloadData(self):
+    print "Benchmarks download is deprecated. It's part of DEPS."
 
-    # If we have a local archive file with the test data, extract it.
-    if os.path.exists(target_dir):
-      shutil.rmtree(target_dir)
-    archive_file = "downloaded_%s_%s.tar.gz" % (target_dir, revision)
-    if os.path.exists(archive_file):
-      with tarfile.open(archive_file, "r:gz") as tar:
-        tar.extractall()
-      with open(revision_file, "w") as f:
-        f.write(revision)
-      return
+    def rm_dir(directory):
+      directory_name = os.path.join(self.root, directory)
+      if os.path.exists(directory_name):
+        shutil.rmtree(directory_name)
 
-    # No cached copy. Check out via SVN, and pack as .tar.gz for later use.
-    command = "svn co %s -r %s %s" % (url, revision, target_dir)
-    code = subprocess.call(command, shell=True)
-    if code != 0:
-      raise Exception("Error checking out %s benchmark" % target_dir)
-    with tarfile.open(archive_file, "w:gz") as tar:
-      tar.add("%s" % target_dir)
-    with open(revision_file, "w") as f:
-      f.write(revision)
-
-  def DownloadData(self):
-    old_cwd = os.getcwd()
-    os.chdir(os.path.abspath(self.root))
-
-    self._DownloadIfNecessary(
-        ("http://svn.webkit.org/repository/webkit/trunk/PerformanceTests/"
-         "SunSpider/tests/sunspider-1.0.2/"),
-        "159499", "sunspider")
-
-    self._DownloadIfNecessary(
-        ("http://kraken-mirror.googlecode.com/svn/trunk/kraken/tests/"
-         "kraken-1.1/"),
-        "8", "kraken")
-
-    self._DownloadIfNecessary(
-        "http://octane-benchmark.googlecode.com/svn/trunk/",
-        "26", "octane")
-
-    os.chdir(old_cwd)
+    # Clean up old directories and archive files.
+    rm_dir('kraken')
+    rm_dir('octane')
+    rm_dir('sunspider')
+    archive_files = [f for f in os.listdir(self.root)
+                     if f.startswith("downloaded_") or
+                        f.startswith("CHECKED_OUT_")]
+    if len(archive_files) > 0:
+      print "Clobber outdated test archives ..."
+      for f in archive_files:
+        os.remove(os.path.join(self.root, f))
 
   def _VariantGeneratorFactory(self):
     return BenchmarksVariantGenerator
 
 
 def GetSuite(name, root):
   return BenchmarksTestSuite(name, root)