[Pkg-mozext-commits] [adblock-plus] 155/464: Update for the new location of the Mochitest directory

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 79cd17719bb0b1a91ea09d6d5063ae0d48a9daf9
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Thu May 19 12:18:28 2011 +0200

    Update for the new location of the Mochitest directory
---
 packager.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packager.py b/packager.py
index 3d17cb0..f7f36b2 100644
--- a/packager.py
+++ b/packager.py
@@ -54,7 +54,7 @@ def getTestEnvFiles(baseDir):
   return [os.path.join(baseDir, file) for file in ('components', 'defaults', 'bootstrap.js', 'chrome.manifest', 'icon.png', 'icon64.png')]
 
 def getIgnoredFiles(params):
-  result = ['tests', 'mochitest', '.incomplete', 'meta.properties']
+  result = ['.incomplete', 'meta.properties']
   if params['releaseBuild']:
     result.append('TimeLine.jsm')
   return result
@@ -331,8 +331,8 @@ def setupTestEnvironment(baseDir, profileDirs):
     files['chrome.manifest'] = re.sub(r'\bjar:chrome/\w+\.jar!', '%s/chrome' % baseURL, files['chrome.manifest'])
     files['chrome.manifest'] = re.sub(r'\bresource\s+\S+\s+', r'\0%s/' % baseURL, files['chrome.manifest'])
     files['chrome.manifest'] = re.sub(r'\b(content\s+\S+\s+)(\w+/)', r'\1%s/\2' % baseURL, files['chrome.manifest'])
-    if os.path.exists(os.path.join(baseDir, 'chrome', 'content', 'mochitest')):
-      files['chrome.manifest'] += 'content mochikit %s/chrome/content/mochitest/\n' % baseURL
+    if os.path.exists(os.path.join(baseDir, 'mochitest')):
+      files['chrome.manifest'] += 'content mochikit %s/mochitest/\n' % baseURL
 
   id = metadata.get('general', 'id')
   for dir in profileDirs:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git