unittests/cargotests: add tests for Cargo.toml parsing

Signed-off-by: Paolo Bonzini <[email protected]>

Author: bonzini

mesonbuild/cargo/interpreter.py

@@ -262,6 +262,7 @@ def _create_dependencies(self, pkg: PackageState, build: builder.Builder) -> T.L
         return ast
 
     def _create_system_dependency(self, name: str, dep: SystemDependency, build: builder.Builder) -> T.List[mparser.BaseNode]:
+        # TODO: handle feature_overrides
         kw = {
             'version': build.array([build.string(s) for s in dep.version]),
             'required': build.bool(not dep.optional),

unittests/cargotests.py

@@ -10,6 +10,8 @@
 
 from mesonbuild.cargo import cfg, load_wraps
 from mesonbuild.cargo.cfg import TokenType
+from mesonbuild.cargo.manifest import Manifest
+from mesonbuild.cargo.toml import load_toml
 from mesonbuild.cargo.version import convert
 
 
@@ -206,3 +208,185 @@ def test_cargo_lock(self) -> None:
             self.assertEqual(wraps[1].get('method'), 'cargo')
             self.assertEqual(wraps[1].get('url'), 'https://github.com/gtk-rs/gtk-rs-core')
             self.assertEqual(wraps[1].get('revision'), '23c5599424cc75ec66618891c915d9f490f6e4c2')
+
+class CargoTomlTest(unittest.TestCase):
+    CARGO_TOML_1 = textwrap.dedent('''\
+        [package]
+        name = "mandelbrot"
+        version = "0.1.0"
+        authors = ["Sebastian Dröge <[email protected]>"]
+        edition = "2018"
+        license = "GPL-3.0"
+
+        [package.metadata.docs.rs]
+        all-features = true
+        rustc-args = [
+            "--cfg",
+            "docsrs",
+        ]
+        rustdoc-args = [
+            "--cfg",
+            "docsrs",
+            "--generate-link-to-definition",
+        ]
+
+        [dependencies]
+        gtk = { package = "gtk4", version = "0.9" }
+        num-complex = "0.4"
+        rayon = "1.0"
+        once_cell = "1"
+        async-channel = "2.0"
+        zerocopy = { version = "0.7", features = ["derive"] }
+
+        [dev-dependencies.gir-format-check]
+        version = "^0.1"
+        ''')
+
+    CARGO_TOML_2 = textwrap.dedent('''\
+        [package]
+        name = "pango"
+        edition = "2021"
+        rust-version = "1.70"
+        version = "0.20.4"
+        authors = ["The gtk-rs Project Developers"]
+
+        [package.metadata.system-deps.pango]
+        name = "pango"
+        version = "1.40"
+
+        [package.metadata.system-deps.pango.v1_42]
+        version = "1.42"
+
+        [lib]
+        name = "pango"
+
+        [[test]]
+        name = "check_gir"
+        path = "tests/check_gir.rs"
+
+        [features]
+        v1_42 = ["pango-sys/v1_42"]
+        v1_44 = [
+            "v1_42",
+            "pango-sys/v1_44",
+        ]
+    ''')
+
+    def test_cargo_toml_package(self) -> None:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            fname = os.path.join(tmpdir, 'Cargo.toml')
+            with open(fname, 'w', encoding='utf-8') as f:
+                f.write(self.CARGO_TOML_1)
+            manifest_toml = load_toml(fname)
+            manifest = Manifest.from_raw(manifest_toml, 'Cargo.toml')
+
+        self.assertEqual(manifest.package.name, 'mandelbrot')
+        self.assertEqual(manifest.package.version, '0.1.0')
+        self.assertEqual(manifest.package.authors[0], 'Sebastian Dröge <[email protected]>')
+        self.assertEqual(manifest.package.edition, '2018')
+        self.assertEqual(manifest.package.license, 'GPL-3.0')
+
+        print(manifest.package.metadata)
+        self.assertEqual(len(manifest.package.metadata), 1)
+
+    def test_cargo_toml_dependencies(self) -> None:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            fname = os.path.join(tmpdir, 'Cargo.toml')
+            with open(fname, 'w', encoding='utf-8') as f:
+                f.write(self.CARGO_TOML_1)
+            manifest_toml = load_toml(fname)
+            manifest = Manifest.from_raw(manifest_toml, 'Cargo.toml')
+
+        self.assertEqual(len(manifest.dependencies), 6)
+        self.assertEqual(manifest.dependencies['gtk'].package, 'gtk4')
+        self.assertEqual(manifest.dependencies['gtk'].version, ['>= 0.9', '< 0.10'])
+        self.assertEqual(manifest.dependencies['gtk'].api, '0.9')
+        self.assertEqual(manifest.dependencies['num-complex'].package, 'num-complex')
+        self.assertEqual(manifest.dependencies['num-complex'].version, ['>= 0.4', '< 0.5'])
+        self.assertEqual(manifest.dependencies['num-complex'].api, '0.4')
+        self.assertEqual(manifest.dependencies['rayon'].package, 'rayon')
+        self.assertEqual(manifest.dependencies['rayon'].version, ['>= 1.0', '< 2'])
+        self.assertEqual(manifest.dependencies['rayon'].api, '1')
+        self.assertEqual(manifest.dependencies['once_cell'].package, 'once_cell')
+        self.assertEqual(manifest.dependencies['once_cell'].version, ['>= 1', '< 2'])
+        self.assertEqual(manifest.dependencies['once_cell'].api, '1')
+        self.assertEqual(manifest.dependencies['async-channel'].package, 'async-channel')
+        self.assertEqual(manifest.dependencies['async-channel'].version, ['>= 2.0', '< 3'])
+        self.assertEqual(manifest.dependencies['async-channel'].api, '2')
+        self.assertEqual(manifest.dependencies['zerocopy'].package, 'zerocopy')
+        self.assertEqual(manifest.dependencies['zerocopy'].version, ['>= 0.7', '< 0.8'])
+        self.assertEqual(manifest.dependencies['zerocopy'].features, ['derive'])
+        self.assertEqual(manifest.dependencies['zerocopy'].api, '0.7')
+
+        self.assertEqual(len(manifest.dev_dependencies), 1)
+        self.assertEqual(manifest.dev_dependencies['gir-format-check'].package, 'gir-format-check')
+        self.assertEqual(manifest.dev_dependencies['gir-format-check'].version, ['>= 0.1', '< 0.2'])
+        self.assertEqual(manifest.dev_dependencies['gir-format-check'].api, '0.1')
+
+    def test_cargo_toml_targets(self) -> None:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            fname = os.path.join(tmpdir, 'Cargo.toml')
+            with open(fname, 'w', encoding='utf-8') as f:
+                f.write(self.CARGO_TOML_2)
+            manifest_toml = load_toml(fname)
+            manifest = Manifest.from_raw(manifest_toml, 'Cargo.toml')
+
+        self.assertEqual(manifest.lib.name, 'pango')
+        self.assertEqual(manifest.lib.crate_type, ['lib'])
+        self.assertEqual(manifest.lib.path, os.path.join('src', 'lib.rs'))
+        self.assertEqual(manifest.lib.test, True)
+        self.assertEqual(manifest.lib.doctest, True)
+        self.assertEqual(manifest.lib.bench, True)
+        self.assertEqual(manifest.lib.doc, True)
+        self.assertEqual(manifest.lib.harness, True)
+        self.assertEqual(manifest.lib.edition, '2015')
+        self.assertEqual(manifest.lib.required_features, [])
+        self.assertEqual(manifest.lib.plugin, False)
+        self.assertEqual(manifest.lib.proc_macro, False)
+        self.assertEqual(manifest.lib.doc_scrape_examples, True)
+
+        self.assertEqual(len(manifest.test), 1)
+        self.assertEqual(manifest.test[0].name, 'check_gir')
+        self.assertEqual(manifest.test[0].crate_type, ['bin'])
+        self.assertEqual(manifest.test[0].path, 'tests/check_gir.rs')
+        self.assertEqual(manifest.lib.path, os.path.join('src', 'lib.rs'))
+        self.assertEqual(manifest.test[0].test, True)
+        self.assertEqual(manifest.test[0].doctest, False)
+        self.assertEqual(manifest.test[0].bench, True)
+        self.assertEqual(manifest.test[0].doc, False)
+        self.assertEqual(manifest.test[0].harness, True)
+        self.assertEqual(manifest.test[0].edition, '2015')
+        self.assertEqual(manifest.test[0].required_features, [])
+        self.assertEqual(manifest.test[0].plugin, False)
+
+    def test_cargo_toml_system_deps(self) -> None:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            fname = os.path.join(tmpdir, 'Cargo.toml')
+            with open(fname, 'w', encoding='utf-8') as f:
+                f.write(self.CARGO_TOML_2)
+            manifest_toml = load_toml(fname)
+            manifest = Manifest.from_raw(manifest_toml, 'Cargo.toml')
+
+        self.assertIn('system-deps', manifest.package.metadata)
+
+        self.assertEqual(len(manifest.system_dependencies), 1)
+        self.assertEqual(manifest.system_dependencies['pango'].name, 'pango')
+        self.assertEqual(manifest.system_dependencies['pango'].version, ['>=1.40'])
+        self.assertEqual(manifest.system_dependencies['pango'].optional, False)
+        self.assertEqual(manifest.system_dependencies['pango'].feature, None)
+
+        self.assertEqual(len(manifest.system_dependencies['pango'].feature_overrides), 1)
+        self.assertEqual(manifest.system_dependencies['pango'].feature_overrides['v1_42'], {'version': '1.42'})
+
+    def test_cargo_toml_features(self) -> None:
+        with tempfile.TemporaryDirectory() as tmpdir:
+            fname = os.path.join(tmpdir, 'Cargo.toml')
+            with open(fname, 'w', encoding='utf-8') as f:
+                f.write(self.CARGO_TOML_2)
+            manifest_toml = load_toml(fname)
+            manifest = Manifest.from_raw(manifest_toml, 'Cargo.toml')
+
+        self.assertEqual(len(manifest.features), 3)
+        self.assertEqual(manifest.features['v1_42'], ['pango-sys/v1_42'])
+        self.assertEqual(manifest.features['v1_44'], ['v1_42', 'pango-sys/v1_44'])
+        self.assertEqual(manifest.features['default'], [])