Port testcase to precise compiler invocations

Author: adrian-prantl

lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py

@@ -21,17 +21,16 @@
 class TestSwiftRewriteClangPaths(TestBase):
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
-    @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))
+    @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'false'))
     @skipUnlessDarwin
     @swiftTest
     @skipIf(debug_info=no_match(["dsym"]))
-    @expectedFailureAll(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
     def testWithRemap(self):
         self.dotest(True)
 
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
-    @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))
+    @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'false'))
     @skipUnlessDarwin
     @swiftTest
     @skipIf(debug_info=no_match(["dsym"]))
@@ -88,47 +87,16 @@ def dotest(self, remap):
             self.expect("expression foo", error=True)
 
         # Scan through the types log.
-        errs = 0
-        found_iquote = 0
-        found_f = 0
-        found_i1 = 0
-        found_i2 = 0
-        found_rel = 0
-        found_abs = 0
-        found_ovl = 0
-        in_scratch_context = False
-        import io
-        logfile = io.open(log, "r", encoding='utf-8')
-        for line in logfile:
-            self.assertFalse("remapped -iquote" in line)
-            if "error: " in line and "Foo" in line:
-                errs += 1
-                continue
-            if line.startswith(" SwiftASTContextForExpressions"):
-                in_scratch_context = True
-                if " remapped " in line:
-                    if line[:-1].endswith('/user'):
-                        found_abs += 1;
-                    continue
-            if not in_scratch_context:
-                continue
-            if 'user/iquote-path'      in line: found_iquote += 1; continue
-            if 'user/I-single'         in line: found_i1 += 1;     continue
-            if 'user/I-double'         in line: found_i2 += 1;     continue
-            if './iquote-path'         in line: found_rel += 1;    continue
-            if './I-'                  in line: found_rel += 1;    continue
-            if '/user/Frameworks'      in line: found_f += 1;      continue
-            if 'user/Foo/overlay.yaml' in line: found_ovl += 1;    continue
-
-        if remap:
-            self.assertEqual(errs, 0, "expected no module import error")
-            # Counting occurences in the scratch context.
-            self.assertEqual(found_iquote, 3)
-            self.assertEqual(found_i1, 3)
-            self.assertEqual(found_i2, 3)
-            self.assertEqual(found_f, 3)
-            self.assertEqual(found_rel, 0)
-            self.assertEqual(found_abs, 1)
-            self.assertEqual(found_ovl, 3)
-        else:
-            self.assertGreater(errs, 0, "expected module import error")
+        suffix = "REMAP" if remap else "NORMAL"
+        self.filecheck('platform shell cat "%s"' % log, __file__,
+                       '--check-prefix=CHECK_' + suffix)
+# CHECK_REMAP-NOT: remapped -iquote
+# CHECK_REMAP-NOT: error:{{.*}}Foo
+# CHECK_NORMAL: error:{{.*}}Foo
+# CHECK_REMAP-DAG: SwiftASTContextForExpressions(module: "Foo"{{.*}}/buildbot/Foo{{.*}} -> {{.*}}/user/Foo
+# CHECK_REMAP-DAG: SwiftASTContextForExpressions(module: "Foo"{{.*}}/buildbot/iquote-path{{.*}} -> {{.*}}/user/iquote-path
+# CHECK_REMAP-DAG: SwiftASTContextForExpressions(module: "Foo"{{.*}}/buildbot/I-double{{.*}} -> {{.*}}/user/I-double
+# CHECK_REMAP-DAG: SwiftASTContextForExpressions(module: "Foo"{{.*}}/buildbot/I-single{{.*}} -> {{.*}}/user/I-single
+# CHECK_REMAP-DAG: SwiftASTContextForExpressions(module: "Foo"{{.*}}/buildbot/Frameworks{{.*}} -> {{.*}}/user/Frameworks
+# CHECK_REMAP-DAG: SwiftASTContextForExpressions(module: "Foo"{{.*}}/nonexisting-rootdir{{.*}} -> {{.*}}/user
+# CHECK_REMAP-DAG: SwiftASTContextForExpressions(module: "Foo"{{.*}}/buildbot/Foo/overlay.yaml{{.*}} -> {{.*}}/user/Foo/overlay.yaml