Revision: 20470
Author:   [email protected]
Date:     Thu Apr  3 11:13:06 2014 UTC
Log:      Version 3.24.35.27

Merged r19606, r19620, r19707 into 3.24 branch.

Update test262 to get test data from github

Update README about where the test262 files are downloaded from.

Update .gitignore to new test262 package name.

BUG=
LOG=N
[email protected]

Review URL: https://codereview.chromium.org/223673004
http://code.google.com/p/v8/source/detail?r=20470

Modified:
 /branches/3.24/.gitignore
 /branches/3.24/src/version.cc
 /branches/3.24/test/test262/README
 /branches/3.24/test/test262/testcfg.py

=======================================
--- /branches/3.24/.gitignore   Wed Sep 25 08:19:55 2013 UTC
+++ /branches/3.24/.gitignore   Thu Apr  3 11:13:06 2014 UTC
@@ -46,7 +46,7 @@
 /test/mozilla/data
 /test/mozilla/downloaded_*
 /test/test262/data
-/test/test262/test262-*
+/test/test262/tc39-test262-*
 /third_party
 /tools/jsfunfuzz
 /tools/jsfunfuzz.zip
=======================================
--- /branches/3.24/src/version.cc       Wed Apr  2 22:39:52 2014 UTC
+++ /branches/3.24/src/version.cc       Thu Apr  3 11:13:06 2014 UTC
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     24
 #define BUILD_NUMBER      35
-#define PATCH_LEVEL       26
+#define PATCH_LEVEL       27
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0
=======================================
--- /branches/3.24/test/test262/README  Tue May 14 08:14:38 2013 UTC
+++ /branches/3.24/test/test262/README  Thu Apr  3 11:13:06 2014 UTC
@@ -2,13 +2,15 @@
 into the v8 test harness. To use the tests check out the test262
 tests from

-  http://hg.ecmascript.org/tests/test262
+  https://github.com/tc39/test262

-at revision 365 as 'data' in this directory.  Using later version
-may be possible but the tests are only known to pass (and indeed run)
+at revision 365 (hash fbba29f) 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.

-hg clone -r 365 http://hg.ecmascript.org/tests/test262 data
+  git clone https://github.com/tc39/test262 data
+  cd data
+  git checkout fbba29f

 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
=======================================
--- /branches/3.24/test/test262/testcfg.py      Mon Sep 23 14:09:36 2013 UTC
+++ /branches/3.24/test/test262/testcfg.py      Thu Apr  3 11:13:06 2014 UTC
@@ -36,9 +36,9 @@
 from testrunner.objects import testcase


-TEST_262_ARCHIVE_REVISION = "99aac3bc1cad"  # This is the r365 revision.
-TEST_262_ARCHIVE_MD5 = "aadbd720ce9bdb4f8f3de066f4d7eea1"
-TEST_262_URL = "http://hg.ecmascript.org/tests/test262/archive/%s.tar.bz2";
+TEST_262_ARCHIVE_REVISION = "fbba29f"  # This is the r365 revision.
+TEST_262_ARCHIVE_MD5 = "e1ff0db438cc12de8fb6da80621b4ef6"
+TEST_262_URL = "https://github.com/tc39/test262/tarball/%s";
 TEST_262_HARNESS = ["sta.js", "testBuiltInObject.js", "testIntl.js"]


@@ -91,7 +91,7 @@
   def DownloadData(self):
     revision = TEST_262_ARCHIVE_REVISION
     archive_url = TEST_262_URL % revision
-    archive_name = os.path.join(self.root, "test262-%s.tar.bz2" % revision)
+ archive_name = os.path.join(self.root, "tc39-test262-%s.tar.gz" % revision)
     directory_name = os.path.join(self.root, "data")
     directory_old_name = os.path.join(self.root, "data.old")
     if not os.path.exists(archive_name):
@@ -108,13 +108,13 @@
       if md5.hexdigest() != TEST_262_ARCHIVE_MD5:
         os.remove(archive_name)
         raise Exception("Hash mismatch of test data file")
-      archive = tarfile.open(archive_name, "r:bz2")
+      archive = tarfile.open(archive_name, "r:gz")
       if sys.platform in ("win32", "cygwin"):
         # Magic incantation to allow longer path names on Windows.
         archive.extractall(u"\\\\?\\%s" % self.root)
       else:
         archive.extractall(self.root)
-      os.rename(os.path.join(self.root, "test262-%s" % revision),
+      os.rename(os.path.join(self.root, "tc39-test262-%s" % revision),
                 directory_name)


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to