Fix meson compile for subproject run/alias targets, add unit tests

mesonbuild/mcompile.py

@@ -152,7 +152,12 @@ def generate_target_names_ninja(target: ParsedTargetName, builddir: Path, intros
     intro_target = get_target_from_intro_data(target, builddir, introspect_data)
 
     if intro_target['type'] in {'alias', 'run'}:
-        return [target.name]
+        if intro_target['subproject']:
+            # TODO: This naming is required because of NinjaBackend.build_run_target_name()
+            #  Can this be consolidated?
+            return [intro_target['subproject'] + '@@' + target.name]
+        else:
+            return [target.name]
     else:
         return [str(Path(out_file).relative_to(builddir.resolve())) for out_file in intro_target['filename']]
 

test cases/common/83 identical target name in subproject/meson.build

@@ -4,6 +4,7 @@ subproject('foo')
 
 true_cmd = find_program('true.py')
 
-executable('bar', 'bar.c')
+bar_exe = executable('bar', 'bar.c')
+alias_target('bar_alias', bar_exe)
 run_target('nop', command : [true_cmd])
 custom_target('cus', output: ['cus.c'], command : [true_cmd])

test cases/common/83 identical target name in subproject/subprojects/foo/meson.build

@@ -2,6 +2,7 @@ project('subfoo', 'c')
 
 true_cmd = find_program('true.py')
 
-executable('bar', 'bar.c')
+bar_exe = executable('bar', 'bar.c')
+alias_target('bar_alias', bar_exe)
 run_target('nop', command : [true_cmd])
 custom_target('cus', output: ['cus.c'], command : [true_cmd])

test cases/common/83 identical target name in subproject/subprojects/foo/true.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python3
 
 if __name__ == '__main__':
-    pass
+    print('Ran subproject true.py')

test cases/common/83 identical target name in subproject/true.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python3
 
 if __name__ == '__main__':
-    pass
+    print('Ran top level true.py')

unittests/allplatformstests.py

@@ -3995,6 +3995,20 @@ def get_static_lib_name(basename: str) -> str:
         out = self._run([*self.meson_command, 'compile', '-C', self.builddir, 'py3hi'])
         self.assertIn('I am Python3.', out)
 
+        # run_target in subproject
+
+        testdir = os.path.join(self.common_test_dir, '83 identical target name in subproject')
+        self.init(testdir, extra_args=['--wipe'])
+        out = self._run([*self.meson_command, 'compile', '-C', self.builddir, './nop'])
+        self.assertIn('Ran top level true.py', out)
+        out = self._run([*self.meson_command, 'compile', '-C', self.builddir, './subprojects/foo/nop'])
+        self.assertIn('Ran subproject true.py', out)
+        # alias in subproject
+        self._run([*self.meson_command, 'compile', '-C', self.builddir, './bar_alias'])
+        self.assertPathExists(os.path.join(self.builddir, get_exe_name('bar')))
+        self._run([*self.meson_command, 'compile', '-C', self.builddir, './subprojects/foo/bar_alias'])
+        self.assertPathExists(os.path.join(self.builddir, 'subprojects', 'foo', get_exe_name('bar')))
+
         # `--$BACKEND-args`
 
         testdir = os.path.join(self.common_test_dir, '1 trivial')