Revert unintented changes

Author: lucic71

tests/lit/lit/formats/Cpp2RustTest.py

@@ -4,12 +4,9 @@
 import lit.Test
 import lit.util
 from .base import TestFormat
-import difflib, os, re, shutil, random, sys
+import difflib, os, re, shutil, random
 import tomli
 
-CURRENT_OS = 'macos' if sys.platform == 'darwin' else 'linux'
-ENTRY_RE = re.compile(r'(\w+)(?:\s*\(([^)]*)\))?')
-
 def read_rust_version():
   toolchain_path = os.path.join(os.path.dirname(__file__),
                                 '../../../../libcc2rs/rust-toolchain.toml')
@@ -72,24 +69,17 @@ def execute(self, test, litConfig):
     def matches_model(match, model):
       if match is None:
         return False
-      spec = match.group(1)
-      if spec is None or spec.strip() == '':
+      models = match.group(1)
+      if models is None or models.strip() == '':
         return True
-      for entry in ENTRY_RE.finditer(spec):
-        if entry.group(1) != model:
-          continue
-        os_list = entry.group(2)
-        if os_list is None:
-          return True
-        if CURRENT_OS in [o.strip() for o in os_list.split(',')]:
-          return True
-      return False
+      return model in re.split(r'\s*,\s*', models.strip())
 
     should_fail = False
     fail_code = lit.Test.FAIL
     xfail = self.regex_xfail.search(text)
     if xfail:
-      should_fail = matches_model(xfail, model)
+      xfail = re.split(r'\s*,\s*', xfail.group(1))
+      should_fail = model in xfail
       fail_code = lit.Test.XFAIL
 
     should_panic = matches_model(self.regex_panic.search(text), model)