A64: Synchronize with r18084.

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 46 matching lines @@
         "kraken/stanford-crypto-aes",
         "kraken/stanford-crypto-ccm",
         "kraken/stanford-crypto-pbkdf2",
         "kraken/stanford-crypto-sha256-iterative",
 
         "octane/box2d",
         "octane/code-load",
         "octane/crypto",
         "octane/deltablue",
         "octane/earley-boyer",
-        "octane/gbemu",
+        "octane/gbemu-part1",
         "octane/mandreel",
         "octane/navier-stokes",
         "octane/pdfjs",
         "octane/raytrace",
         "octane/regexp",
         "octane/richards",
         "octane/splay",
+        "octane/typescript",
+        "octane/zlib",
 
         "sunspider/3d-cube",
         "sunspider/3d-morph",
         "sunspider/3d-raytrace",
         "sunspider/access-binary-trees",
         "sunspider/access-fannkuch",
         "sunspider/access-nbody",
         "sunspider/access-nsieve",
         "sunspider/bitops-3bit-bits-in-byte",
         "sunspider/bitops-bits-in-byte",
@@ skipping 19 matching lines @@
 
   def GetFlagsForTestCase(self, testcase, context):
     result = []
     result += context.mode_flags
     if testcase.path.startswith("kraken"):
       result.append(os.path.join(self.testroot, "%s-data.js" % testcase.path))
       result.append(os.path.join(self.testroot, "%s.js" % testcase.path))
     elif testcase.path.startswith("octane"):
       result.append(os.path.join(self.testroot, "octane/base.js"))
       result.append(os.path.join(self.testroot, "%s.js" % testcase.path))
+      if testcase.path.startswith("octane/gbemu"):
+        result.append(os.path.join(self.testroot, "octane/gbemu-part2.js"))
+      elif testcase.path.startswith("octane/typescript"):
+        result.append(os.path.join(self.testroot,
+                                   "octane/typescript-compiler.js"))
+        result.append(os.path.join(self.testroot, "octane/typescript-input.js"))
+      elif testcase.path.startswith("octane/zlib"):
+        result.append(os.path.join(self.testroot, "octane/zlib-data.js"))
       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()
 
@@ skipping 27 matching lines @@
       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/"),
-        "153700", "sunspider")
+         "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/",
-        "22", "octane")
+        "26", "octane")
 
     os.chdir(old_cwd)
 
   def VariantFlags(self, testcase, default_flags):
     # Both --nocrankshaft and --stressopt are very slow.
     return [[]]
 
 
 def GetSuite(name, root):
   return BenchmarksTestSuite(name, root)