Bug 1234439 - Add a jar.mn to the end-to-end test. r=gps

Also add the corner case that broke mach build faster on Windows in bug 1191230.
This commit is contained in:
Mike Hommey 2015-12-23 15:19:11 +09:00
Родитель 2eabcb84c2
Коммит b91ae3e89f
4 изменённых файлов: 31 добавлений и 1 удалений

Просмотреть файл

@ -0,0 +1,10 @@
foo.jar:
% content bar %child/
% content foo %
foo.js
bar.js (subdir/bar.js)
qux.js (subdir/bar.js)
* child/hoge.js (bar.js)
* child/baz.jsm
% override chrome://foo/bar.svg#hello chrome://bar/bar.svg#hello

Просмотреть файл

@ -58,6 +58,10 @@ RESOURCE_FILES.child += [
DEFINES['FOO'] = 'foo'
JAR_MANIFESTS += [
'jar.mn',
]
DIRS += [
'app',
]

Просмотреть файл

@ -0,0 +1 @@
bar.js

Просмотреть файл

@ -83,6 +83,7 @@ class TestBuild(unittest.TestCase):
config.topobjdir)
overrides = [
'install_manifest_depends=',
'MOZ_CHROME_FILE_FORMAT=flat',
'TEST_MOZBUILD=1',
]
with self.line_handler() as handle_make_line:
@ -133,7 +134,21 @@ class TestBuild(unittest.TestCase):
'bin/baz.ini': 'baz.ini: FOO is foo\n',
'bin/child/bar.ini': 'bar.ini\n',
'bin/child2/qux.ini': 'qux.ini: BAR is not defined\n',
'bin/chrome.manifest': 'manifest components/components.manifest\n',
'bin/chrome.manifest':
'manifest chrome/foo.manifest\n'
'manifest components/components.manifest\n',
'bin/chrome/foo.manifest':
'content bar foo/child/\n'
'content foo foo/\n'
'override chrome://foo/bar.svg#hello '
'chrome://bar/bar.svg#hello\n',
'bin/chrome/foo/bar.js': 'bar.js\n',
'bin/chrome/foo/child/baz.jsm':
'//@line 2 "%sbaz.jsm"\nbaz.jsm: FOO is foo\n' % (test_path),
'bin/chrome/foo/child/hoge.js':
'//@line 2 "%sbar.js"\nbar.js: FOO is foo\n' % (test_path),
'bin/chrome/foo/foo.js': 'foo.js\n',
'bin/chrome/foo/qux.js': 'bar.js\n',
'bin/components/bar.js':
'//@line 2 "%sbar.js"\nbar.js: FOO is foo\n' % (test_path),
'bin/components/components.manifest':