Merge pull request #40226 from porglezomp-misc/clang-patch-patch-patch

Author: swift-ci

utils/build_swift/build_swift/argparse/types.py

@@ -139,9 +139,10 @@ class ClangVersionType(RegexType):
     """
 
     ERROR_MESSAGE = ('Invalid version value, must be '
-                     '"MAJOR.MINOR.PATCH" or "MAJOR.MINOR.PATCH.PATCH"')
+                     '"MAJOR.MINOR.PATCH", "MAJOR.MINOR.PATCH.PATCH"'
+                     ', or "MAJOR.MINOR.PATCH.PATCH.PATCH".')
 
-    VERSION_REGEX = r'^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$'
+    VERSION_REGEX = r'^(\d+)\.(\d+)\.(\d+)(\.(\d+))?(\.(\d+))?$'
 
     def __init__(self):
         super(ClangVersionType, self).__init__(

utils/build_swift/tests/build_swift/argparse/test_types.py

@@ -157,10 +157,15 @@ def test_valid_clang_version(self):
         self.assertIsInstance(version, types.Version)
         self.assertEqual(version.components, (1, 0, 0, 1))
 
+        version = clang_version_type('1.0.0.1.2')
+        self.assertIsInstance(version, types.Version)
+        self.assertEqual(version.components, (1, 0, 0, 1, 2))
+
         clang_version_type('1.0.0')
         clang_version_type('3.0.2.1')
         clang_version_type('200.0.56.3')
         clang_version_type('100000.0.0.1')
+        clang_version_type('5.6.0.994.2')
 
     def test_invalid_clang_version(self):
         clang_version_type = types.ClangVersionType()
@@ -170,9 +175,9 @@ def test_invalid_clang_version(self):
         with self.assertRaises(ArgumentTypeError):
             clang_version_type('3.0')
         with self.assertRaises(ArgumentTypeError):
-            clang_version_type('1.8.0.2.1')
+            clang_version_type('1.8.0.2.1.3')
         with self.assertRaises(ArgumentTypeError):
-            clang_version_type('100.0.56.1.1')
+            clang_version_type('100.0.56.1.1.1')
 
 
 class TestSwiftVersionType(unittest.TestCase):