commit e68ae76a67c3291f66d624dcd164b3a9d3f3af17
author Googler <rosica@google.com> Fri Aug 09 05:42:58 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Aug 09 05:43:22 2019 -0700
tree a31b02778bfcffb11d5d9c0b0d73b26bd7ac896e
parent b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e

Allow the C++ toolchain config rules comparator script to not need toolchain_identifier argument when both --before and --after arguments are CToolchains (coming from Starlark rules instead of CROSSTOOL proto)

We don't need to select a toolchain by the identifier when we get the proto from Starlark rules because in that case the proto contains a single toolchain.
The difference in toolchain_identifier field between the first and the second proto file will be caught as any other field.

RELNOTES: None.
PiperOrigin-RevId: 262543753
Change-Id: I1e66ee302bf551ade883c217f6269f44382393c0

tools/migration/ctoolchain_comparator.py

diff --git a/tools/migration/ctoolchain_comparator.py b/tools/migration/ctoolchain_comparator.py
index 2f6870b..5143e02 100644
--- a/tools/migration/ctoolchain_comparator.py
+++ b/tools/migration/ctoolchain_comparator.py
@@ -46,7 +46,6 @@
                     "The identifier of the CToolchain that is being compared.")
 flags.mark_flag_as_required("before")
 flags.mark_flag_as_required("after")
-flags.mark_flag_as_required("toolchain_identifier")
 
 
 def _to_absolute_path(path):
@@ -67,7 +66,7 @@
   return None
 
 
-def _read_crosstool_or_ctoolchain_proto(input_file, toolchain_identifier):
+def _read_crosstool_or_ctoolchain_proto(input_file, toolchain_identifier=None):
   """Reads a proto file and finds the CToolchain with the given identifier."""
   with open(input_file, "r") as f:
     text = f.read()
@@ -75,6 +74,10 @@
   c_toolchain = crosstool_config_pb2.CToolchain()
   try:
     text_format.Merge(text, crosstool_release)
+    if toolchain_identifier is None:
+      print("CROSSTOOL proto needs a 'toolchain_identifier' specified in "
+            "order to be able to select the right toolchain for comparison.")
+      return None
     toolchain = _find_toolchain(crosstool_release, toolchain_identifier)
     if toolchain is None:
       print(("Cannot find a CToolchain with an identifier '%s' in CROSSTOOL "
@@ -84,7 +87,8 @@
   except text_format.ParseError as crosstool_error:
     try:
       text_format.Merge(text, c_toolchain)
-      if c_toolchain.toolchain_identifier != toolchain_identifier:
+      if (toolchain_identifier is not None and
+          c_toolchain.toolchain_identifier != toolchain_identifier):
         print(("Expected CToolchain with identifier '%s', got CToolchain with "
                "identifier '%s'" % (toolchain_identifier,
                                     c_toolchain.toolchain_identifier)))