From 616e4c5a42af198b6628050ec1bd13ab3d124a4b Mon Sep 17 00:00:00 2001
From: Vaibhav Agrawal <vaibhavmagarwal@gmail.com>
Date: Thu, 10 Jul 2014 09:38:00 +0200
Subject: [PATCH] Bug 1028226 - Clean up the code for manifest parsing.
 r=jmaher

---
 testing/mochitest/runtests.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 7a4cc921922f..5db5d02d0641 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1864,26 +1864,14 @@ class Mochitest(MochitestUtilsMixin):
     """
         Make the list of directories by parsing manifests
     """
-    info = {}
-    for k, v in mozinfo.info.items():
-      if isinstance(k, unicode):
-        k = k.encode('ascii')
-      info[k] = v
-
+    tests = self.getActiveTests(options, False)
     dirlist = []
 
-    manifest = self.getTestManifest(options)
-    tests = manifest.active_tests(disabled=False, options=options, **info)
     for test in tests:
-      pathAbs = os.path.abspath(test['path'])
-      assert pathAbs.startswith(self.testRootAbs)
-      tp = pathAbs[len(self.testRootAbs):].replace('\\', '/').strip('/')
-
-      rootdir = '/'.join(tp.split('/')[:-1])
+      rootdir = '/'.join(test['path'].split('/')[:-1])
       if rootdir not in dirlist:
         dirlist.append(rootdir)
 
-    dirlist.sort()
     return dirlist
 
 def main():