Merging from default

changeset: 3123:08dcd33abccb tag: tip parent: 3121:684d4241af5f user: Justin Wood <Callek@gmail.com> date: Mon Apr 29 14:05:42 2013 -0400 summary: Bug 861295 - Modify --testing-modules-dir for android xpcshell tests. r=rail, f=gbrown --HG-- branch : production-0.8
mozilla-releng · Apr 29, 2013 · 7f8e53d · 7f8e53d
2 parents 835ba11 + 2ec89aa
commit 7f8e53d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/steps/unittest.py b/steps/unittest.py
@@ -748,7 +748,7 @@ def __init__(self, suite, symbols_path=None, xrePath='../hostutils/xre',
                         '--xre-path', xrePath,
                         '--manifest', 'xpcshell/tests/xpcshell_android.ini',
                         '--build-info-json', 'xpcshell/mozinfo.json',
-                        '--testing-modules-dir', 'xpcshell/tests/modules',
+                        '--testing-modules-dir', 'modules',
                         '--local-lib-dir', WithProperties('../%(exedir)s'),
                         '--apk', WithProperties('../%(build_filename)s'),
                         '--no-logfiles']