dependency_cross_matcher.py: Compatibilize parsec and parsec-tool

parsec and parsec-tool share some dependencies. In those shared
dependencies, the used versions should be the same.

 * Modify utils/dependency_cross_matcher.py to cover the case of
   comparing parsec and parsec-tool dependencies as well as the
   previous case of checking mismatches in parsec-tool dependencies.

Signed-off-by: Tomás González <tomasagustin.gonzalezorlando@arm.com>

Author: tgonzalezorlandoarm

tests/ci.sh

@@ -34,7 +34,9 @@ done
 # Dependency mismatcher #
 #########################
 if [ "$MISMATCHER" = "True" ]; then
+
     python3 $(pwd)/utils/dependency_cross_matcher.py --deps_dir $(pwd)
+
     exit 0
 fi
 

utils/dependency_cross_matcher.py

@@ -5,8 +5,10 @@
 import sys
 
 
-def run_cargo_tree(path):
-    cmd = 'cargo tree --all-features -d'
+def run_cargo_tree(path, flags=None):
+    cmd = 'cargo tree'
+    if flags is not None:
+        cmd += ' ' + flags
     prev_dir = os.getcwd()
     os.chdir(os.path.join(path))
     return subprocess.check_output(cmd, shell=True).decode()
@@ -43,14 +45,46 @@ def main(argv=[], prog_name=''):
     parser = argparse.ArgumentParser(prog='DependencyCrossmatcher',
                                      description='Checks the version mismatches for dependencies '
                                                  'in Cargo based repositories')
+    parser.add_argument("-c", "--compare", action='store_true',
+                        help='Check for mismatches between 2 repositories')
     parser.add_argument('--deps_dir',
                         required=True,
-                        help='Existing directory that contains the Cargo.toml for analyzing'
+                        nargs='+',
+                        help='Existing directories that contain Cargo.toml for analyzing '
                              'dependencies')
     args = parser.parse_args()
 
-    mismatches = run_deps_mismatcher(run_cargo_tree(args.deps_dir))
-    print_deps(mismatches)
+    mismatches = dict()
+    parsec_tool_flags = '--all-features -d'
+
+    if args.compare:
+        exceptions = {
+            'bindgen': ['v0.66.1', 'v0.57.0'],
+        }
+        parsec_repo, parsec_tool_repo = args.deps_dir
+        parsec_flags = '--all-features' + ' '
+        parsec_flags = '--features tss-esapi/generate-bindings,cryptoki/generate-bindings -d'
+        mismatches_parsec = run_deps_mismatcher(run_cargo_tree(parsec_repo, parsec_flags))
+        mismatches_parsec_tool = run_deps_mismatcher(run_cargo_tree(parsec_tool_repo,
+                                                                    parsec_tool_flags)
+                                                    )
+
+        # Dependencies that are common to both parsec_repo and parsec_tool_repo repos
+        common_deps = list(set(mismatches_parsec.keys()) & set(mismatches_parsec_tool.keys()))
+        for dep in common_deps:
+            # Symmetric difference of repos parsec_repo and parsec_tool_repo
+            mistmatch = list(set(mismatches_parsec[dep]) ^ set(mismatches_parsec_tool[dep]))
+            if len(mistmatch) > 0:
+                mismatches[dep] = mistmatch
+    else:
+        exceptions = {
+            'base64': ['v0.13.1', 'v0.21.4'],
+            'bitflags': ['v1.3.2', 'v2.4.1'],
+            'nom': ['v5.1.3', 'v7.1.3'],
+            'syn': ['v1.0.109', 'v2.0.38'],
+            'yasna': ['v0.4.0', 'v0.5.2'],
+        }
+        mismatches = run_deps_mismatcher(run_cargo_tree(args.deps_dir[0], parsec_tool_flags))
 
     mismatches = get_deps_with_more_than_1v(mismatches)
 
@@ -60,15 +94,12 @@ def main(argv=[], prog_name=''):
     print('---------------------mistmatches----------------------\n\n')
     print_deps(mismatches)
 
-    exceptions = {
-        'base64': ['v0.13.1', 'v0.21.4'],
-        'bitflags': ['v1.3.2', 'v2.4.1'],
-        'nom': ['v5.1.3', 'v7.1.3'],
-        'syn': ['v1.0.109', 'v2.0.38'],
-        'yasna': ['v0.4.0', 'v0.5.2'],
-    }
+    if not args.compare:
+        errormsg = "Found dependencies version mismatches in parsec-tool"
+    else:
+        errormsg = "Found dependencies version mismatches between parsec and parsec-tool"
 
-    assert exceptions == mismatches, "Found dependencies version mismatches in parsec-tool"
+    assert exceptions == mismatches, errormsg
 
     return 0