Added optional version key to subproject config.

This is used in the c-library (qhull) test, where now the output from the qhull executable is checked.

clang_build/project.py

@@ -84,8 +84,17 @@ def __init__(self, config, environment, multiple_projects, is_root_project, pare
                 _LOGGER.info(f'[[{self.name}]]: external project downloaded')
             self.working_directory = download_directory
 
+            if "version" in config:
+                version = config["version"]
+                try:
+                    _subprocess.run(["git", "checkout", version], cwd=download_directory, stdout=_subprocess.PIPE, stderr=_subprocess.PIPE, encoding='utf-8')
+                except _subprocess.CalledProcessError as e:
+                    error_message = f"[{target_name_full}]: error trying to checkout version \'{version}\' from url \'{url}\'. Message " + e.output
+                    _LOGGER.exception(error_message)
+                    raise RuntimeError(error_message)
+
         # Get subset of config which contains targets not associated to any project name
-        self.targets_config = {key: val for key, val in config.items() if not key in ["subproject", "name", "url"]}
+        self.targets_config = {key: val for key, val in config.items() if not key in ["subproject", "name", "url", "version"]}
 
         # Get subsets of config which define projects
         self.subprojects_config = {key: val for key, val in config.items() if key == "subproject"}

test/c-library/clang-build.toml

@@ -8,8 +8,9 @@ dependencies = ["qhull.qhullcpp", "qhull.qhullstatic_r"]
 ################# Qhull #################
 
 [[subproject]]
-name = "qhull"
-url = "/~https://github.com/qhull/qhull"
+name    = "qhull"
+url     = "/~https://github.com/qhull/qhull"
+version = "v7.2.0"
 
 # Qhull libraries
 

test/test.py

@@ -158,10 +158,12 @@ def test_build_all(self):
         clang_build_try_except(['-d', 'test/c-library', '-V', '-a'])
 
         try:
-            output = subprocess.check_output(['./build/qhull/qhull-executable/default/bin/qhull'], stderr=subprocess.STDOUT).decode('utf-8').strip()
+            output = subprocess.check_output(['./build/qhull/qhull-executable/default/bin/qhull', '-V'], stderr=subprocess.STDOUT).decode('utf-8').strip()
         except subprocess.CalledProcessError:
             self.fail('Could not run a target which should have been built')
 
+        self.assertEqual(output, 'qhull_r 7.2.0 (2015.2.r 2016/01/18)')
+
     # def test_openmp(self):
     #     clang_build_try_except(['-d', 'test/openmp', '-V'])