Index: test/test262/testcfg.py |
diff --git a/test/test262/testcfg.py b/test/test262/testcfg.py |
index 294b39c9163feac30f941e148ac415ce5f8b47ed..e4a3bdeaaf7d8024765abafb1cc27feac188d7d2 100644 |
--- a/test/test262/testcfg.py |
+++ b/test/test262/testcfg.py |
@@ -1,4 +1,4 @@ |
-# Copyright 2011 the V8 project authors. All rights reserved. |
+# Copyright 2012 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: |
@@ -103,23 +103,21 @@ class Test262TestConfiguration(test.TestConfiguration): |
revision = TEST_262_ARCHIVE_REVISION |
archive_url = TEST_262_URL % revision |
archive_name = join(self.root, 'test262-%s.tar.bz2' % revision) |
- directory_name = join(self.root, "test262-%s" % revision) |
- if not exists(directory_name) or not exists(archive_name): |
- if not exists(archive_name): |
- print "Downloading test data from %s ..." % archive_url |
- urllib.urlretrieve(archive_url, archive_name) |
- if not exists(directory_name): |
- print "Extracting test262-%s.tar.bz2 ..." % revision |
- md5 = hashlib.md5() |
- with open(archive_name,'rb') as f: |
- for chunk in iter(lambda: f.read(8192), ''): |
- md5.update(chunk) |
- if md5.hexdigest() != TEST_262_ARCHIVE_MD5: |
- raise Exception("Hash mismatch of test data file") |
- archive = tarfile.open(archive_name, 'r:bz2') |
- archive.extractall(join(self.root)) |
- if not exists(join(self.root, 'data')): |
- os.symlink(directory_name, join(self.root, 'data')) |
+ directory_name = join(self.root, 'data') |
+ if not exists(archive_name): |
+ print "Downloading test data from %s ..." % archive_url |
+ urllib.urlretrieve(archive_url, archive_name) |
+ if not exists(directory_name): |
+ print "Extracting test262-%s.tar.bz2 ..." % revision |
+ md5 = hashlib.md5() |
+ with open(archive_name,'rb') as f: |
+ for chunk in iter(lambda: f.read(8192), ''): |
+ md5.update(chunk) |
+ if md5.hexdigest() != TEST_262_ARCHIVE_MD5: |
+ raise Exception("Hash mismatch of test data file") |
+ archive = tarfile.open(archive_name, 'r:bz2') |
+ archive.extractall(join(self.root)) |
+ os.rename(join(self.root, 'test262-%s' % revision), directory_name) |
def GetBuildRequirements(self): |
return ['d8'] |