Change the mozilla test support. The mozilla tests are now expected

to be located at tests/mozilla/data.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@43 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/test/mozilla/mozilla.status b/test/mozilla/mozilla.status
index 2fe1da7..88c2042 100644 (file)
--- a/test/mozilla/mozilla.status
+++ b/test/mozilla/mozilla.status
@@ -31,7 +31,7 @@
 # debugging.
 # --------------------------------------------------------------------
 
-prefix mozilla_js_tests
+prefix mozilla
 def FAIL_OK = FAIL, OKAY
 
 

diff --git a/test/mozilla/testcfg.py b/test/mozilla/testcfg.py
index 0214f9b..96fe4f3 100644 (file)
--- a/test/mozilla/testcfg.py
+++ b/test/mozilla/testcfg.py
@@ -91,7 +91,7 @@ class MozillaTestConfiguration(test.TestConfiguration):
   def ListTests(self, current_path, path, mode):
     tests = []
     for test_dir in TEST_DIRS:
-      current_root = join(self.root, test_dir)
+      current_root = join(self.root, 'data', test_dir)
       for root, dirs, files in os.walk(current_root):
         for dotted in [x  for x in dirs if x.startswith('.')]:
           dirs.remove(dotted)
@@ -111,6 +111,7 @@ class MozillaTestConfiguration(test.TestConfiguration):
         for file in files:
           if (not file in FRAMEWORK) and file.endswith('.js'):
             full_path = root_path + [file[:-3]]
+            full_path = [x for x in full_path if x != 'data']
             if self.Contains(path, full_path):
               test = MozillaTestCase(join(root, file), full_path, self.context,
                                      mode, framework)