Bug 1235021 - Add a relative jar.mn in the end-to-end test. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 24 Dec 2015 13:24:38 +0900
changeset 277913 12386f9fb7179f092ab50c56791dab280fdadb2a
parent 277912 3e4d6d892dd8e8bfb31022ca5268c17d7529c41b
child 277914 40ae4d686d46eccff4710ec13f0103fe370be66d
push id69650
push usermh@glandium.org
push dateWed, 30 Dec 2015 22:08:21 +0000
treeherdermozilla-inbound@70708efd7d3b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1235021
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1235021 - Add a relative jar.mn in the end-to-end test. r=gps
python/mozbuild/mozbuild/test/backend/data/build/app/moz.build
python/mozbuild/mozbuild/test/backend/test_build.py
--- a/python/mozbuild/mozbuild/test/backend/data/build/app/moz.build
+++ b/python/mozbuild/mozbuild/test/backend/data/build/app/moz.build
@@ -40,10 +40,14 @@ EXTRA_COMPONENTS += [
 EXTRA_PP_COMPONENTS += [
     '../bar.js',
 ]
 
 JS_PREFERENCE_FILES += [
     '../prefs.js',
 ]
 
+JAR_MANIFESTS += [
+    '../jar.mn',
+]
+
 DEFINES['FOO'] = 'bar'
 DEFINES['BAR'] = True
--- a/python/mozbuild/mozbuild/test/backend/test_build.py
+++ b/python/mozbuild/mozbuild/test/backend/test_build.py
@@ -164,17 +164,31 @@ class TestBuild(unittest.TestCase):
                 % (test_path),
             'bin/modules/foo.jsm': 'foo.jsm\n',
             'bin/res/resource': 'resource\n',
             'bin/res/child/resource2': 'resource2\n',
 
             'bin/app/baz.ini': 'baz.ini: FOO is bar\n',
             'bin/app/child/bar.ini': 'bar.ini\n',
             'bin/app/child2/qux.ini': 'qux.ini: BAR is defined\n',
-            'bin/app/chrome.manifest': 'manifest components/components.manifest\n',
+            'bin/app/chrome.manifest':
+                'manifest chrome/foo.manifest\n'
+                'manifest components/components.manifest\n',
+            'bin/app/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/app/chrome/foo/bar.js': 'bar.js\n',
+            'bin/app/chrome/foo/child/baz.jsm':
+                '//@line 2 "%sbaz.jsm"\nbaz.jsm: FOO is bar\n' % (test_path),
+            'bin/app/chrome/foo/child/hoge.js':
+                '//@line 2 "%sbar.js"\nbar.js: FOO is bar\n' % (test_path),
+            'bin/app/chrome/foo/foo.js': 'foo.js\n',
+            'bin/app/chrome/foo/qux.js': 'bar.js\n',
             'bin/app/components/bar.js':
                 '//@line 2 "%sbar.js"\nbar.js: FOO is bar\n' % (test_path),
             'bin/app/components/components.manifest':
                 'component {foo} foo.js\ncomponent {bar} bar.js\n',
             'bin/app/components/foo.js': 'foo.js\n',
             'bin/app/defaults/preferences/prefs.js': 'prefs.js\n',
             'bin/app/foo.ini': 'foo.ini\n',
             'bin/app/modules/baz.jsm':