|
@@ -10,7 +10,7 @@ MozReview-Commit-ID: J4gt1fGUzOa
|
|
diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
|
|
diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
|
|
--- a/python/mozbuild/mozbuild/frontend/data.py
|
|
--- a/python/mozbuild/mozbuild/frontend/data.py
|
|
+++ b/python/mozbuild/mozbuild/frontend/data.py
|
|
+++ b/python/mozbuild/mozbuild/frontend/data.py
|
|
-@@ -482,16 +482,19 @@ class BaseProgram(Linkable):
|
|
|
|
|
|
+@@ -424,16 +424,19 @@ class BaseProgram(Linkable):
|
|
if self.installed:
|
|
if self.installed:
|
|
return ObjDirPath(self._context, '!/' + mozpath.join(self.install_target, self.program))
|
|
return ObjDirPath(self._context, '!/' + mozpath.join(self.install_target, self.program))
|
|
else:
|
|
else:
|
|
@@ -30,7 +30,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
|
|
|
|
|
|
|
|
|
|
class HostProgram(HostMixin, BaseProgram):
|
|
class HostProgram(HostMixin, BaseProgram):
|
|
-@@ -596,16 +599,20 @@ class BaseLibrary(Linkable):
|
|
|
|
|
|
+@@ -519,16 +522,20 @@ class BaseLibrary(Linkable):
|
|
)
|
|
)
|
|
self.import_name = self.lib_name
|
|
self.import_name = self.lib_name
|
|
|
|
|
|
@@ -54,28 +54,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
|
|
diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
|
|
diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
|
|
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
|
|
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
|
|
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
|
|
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
|
|
-@@ -649,16 +649,20 @@ class TestEmitterBasic(unittest.TestCase
|
|
|
|
- self.assertIsInstance(objs[3], Program)
|
|
|
|
- self.assertIsInstance(objs[4], SimpleProgram)
|
|
|
|
- self.assertIsInstance(objs[5], SimpleProgram)
|
|
|
|
-
|
|
|
|
- self.assertEqual(objs[3].program, 'test_program.prog')
|
|
|
|
- self.assertEqual(objs[4].program, 'test_program1.prog')
|
|
|
|
- self.assertEqual(objs[5].program, 'test_program2.prog')
|
|
|
|
-
|
|
|
|
-+ self.assertEqual(objs[3].name, 'test_program.prog')
|
|
|
|
-+ self.assertEqual(objs[4].name, 'test_program1.prog')
|
|
|
|
-+ self.assertEqual(objs[5].name, 'test_program2.prog')
|
|
|
|
-+
|
|
|
|
- self.assertEqual(objs[4].objs,
|
|
|
|
- [mozpath.join(reader.config.topobjdir,
|
|
|
|
- 'test_program1.%s' %
|
|
|
|
- reader.config.substs['OBJ_SUFFIX'])])
|
|
|
|
- self.assertEqual(objs[5].objs,
|
|
|
|
- [mozpath.join(reader.config.topobjdir,
|
|
|
|
- 'test_program2.%s' %
|
|
|
|
- reader.config.substs['OBJ_SUFFIX'])])
|
|
|
|
-@@ -1176,19 +1180,25 @@ class TestEmitterBasic(unittest.TestCase
|
|
|
|
|
|
+@@ -1116,19 +1116,25 @@ class TestEmitterBasic(unittest.TestCase
|
|
|
|
|
|
def test_linkables_cxx_link(self):
|
|
def test_linkables_cxx_link(self):
|
|
"""Test that linkables transitively set cxx_link properly."""
|
|
"""Test that linkables transitively set cxx_link properly."""
|