Update test262-es6 to 6/11

This reverts commit 67b16919 and picks
up the fixes to the yaml parser upstream.

BUG=N
LOG=N
R=adamk@chromium.org, machenbach@chromium.org

Review URL: https://codereview.chromium.org/1175313003

Cr-Commit-Position: refs/heads/master@{#29056}

test/test262-es6/README

@@ -4,13 +4,13 @@ tests from
 
   https://github.com/tc39/test262
 
-at hash 43acf61 (2015/03/31 revision) as 'data' in this directory.  Using later
+at hash 488c0a7 (2015/06/11 revision) as 'data' in this directory.  Using later
 version may be possible but the tests are only known to pass (and indeed run)
 with that revision.
 
   git clone https://github.com/tc39/test262 data
   cd data
-  git checkout 43acf61
+  git checkout 488c0a7
 
 If you do update to a newer revision you may have to change the test
 harness adapter code since it uses internal functionality from the

test/test262-es6/testcfg.py

@@ -37,8 +37,8 @@ from testrunner.local import testsuite
 from testrunner.local import utils
 from testrunner.objects import testcase
 
-TEST_262_ARCHIVE_REVISION = "43acf61"  # This is the 2015-03-31 revision.
-TEST_262_ARCHIVE_MD5 = "a77a0352a0462be98e50522a15b7a3c4"
+TEST_262_ARCHIVE_REVISION = "488c0a7"  # This is the 2015-06-11 revision.
+TEST_262_ARCHIVE_MD5 = "f7d4ec9be81f1e1f10fd8a61c71baead"
 TEST_262_URL = "https://github.com/tc39/test262/tarball/%s"
 TEST_262_HARNESS_FILES = ["sta.js", "assert.js"]
 
@@ -79,6 +79,16 @@ class Test262TestSuite(testsuite.TestSuite):
             self.GetIncludesForTest(testcase) + ["--harmony"] +
             [os.path.join(self.testroot, testcase.path + ".js")])
 
+  def VariantFlags(self, testcase, default_flags):
+    flags = super(Test262TestSuite, self).VariantFlags(testcase, default_flags)
+    test_record = self.GetTestRecord(testcase)
+    if "noStrict" in test_record:
+      return flags
+    strict_flags = [f + ["--use-strict"] for f in flags]
+    if "onlyStrict" in test_record:
+      return strict_flags
+    return flags + strict_flags
+
   def LoadParseTestRecord(self):
     if not self.ParseTestRecord:
       root = os.path.join(self.root, *TEST_262_TOOLS_PATH)

tools/testrunner/local/statusfile.py

@@ -57,7 +57,8 @@ for var in ["debug", "release", "big", "little",
             "android_arm", "android_arm64", "android_ia32", "android_x87",
             "android_x64", "arm", "arm64", "ia32", "mips", "mipsel",
             "mips64el", "x64", "x87", "nacl_ia32", "nacl_x64", "ppc", "ppc64",
-            "macos", "windows", "linux", "aix"]:
+            "macos", "windows", "linux", "aix",
+            "strict", "sloppy"]:
   VARIABLES[var] = var