Merge pull request #66254 from ktoso/remove-lit-leaks

Author: hamishknight

test/lit.cfg

@@ -1018,7 +1018,7 @@ else:
 swift_reflection_test_name = 'swift-reflection-test' + variant_suffix
 
 def use_interpreter_for_simple_runs():
-    def make_simple_target_run(gyb=False, stdlib=False, parameterized=False, leaks=False):
+    def make_simple_target_run(gyb=False, stdlib=False, parameterized=False):
         result = ''
         if gyb:
             result += ('%empty-directory(%t) && '
@@ -1046,7 +1046,6 @@ def use_interpreter_for_simple_runs():
     config.target_run_stdlib_swift = make_simple_target_run(stdlib=True)
     config.target_run_simple_swift = make_simple_target_run()
     config.target_run_simple_swift_parameterized = make_simple_target_run(parameterized=True)
-    config.target_run_simple_leaks_swift_parameterized = make_simple_leaks_target_run(parameterized=True)
     config.target_run_stdlib_swift_parameterized = make_simple_target_run(stdlib=True, parameterized=True)
     config.target_run_simple_swiftgyb_parameterized = make_simple_target_run(gyb=True, parameterized=True)
     config.available_features.add('interpret')
@@ -2286,11 +2285,6 @@ elif not kIsWindows:
         lit_config.note('Testing with the just-built libraries')
 
     lit_config.note('Library load path: {0}'.format(os.path.pathsep.join(target_stdlib_path)))
-    config.target_run_with_leaks = (
-        "/usr/bin/env " +
-        construct_library_path_env(target_stdlib_path) +
-        " xcrun leaks -atExit -- " +
-        config.target_run)
     config.target_run = (
         "/usr/bin/env " +
         construct_library_path_env(target_stdlib_path) +
@@ -2326,17 +2320,6 @@ if not getattr(config, 'target_run_simple_swift', None):
            escape_for_substitute_captures(config.target_codesign),
            escape_for_substitute_captures(config.target_run))
     )
-    if not kIsWindows:
-        config.target_run_simple_leaks_swift_parameterized = SubstituteCaptures(
-            r"%%empty-directory(%%t) && "
-            r"%s %s %%s \1 -o %%t/a.out -module-name main  && "
-            r"%s %%t/a.out && "
-            r"%s %%t/a.out"
-            % (escape_for_substitute_captures(config.target_build_swift),
-               escape_for_substitute_captures(mcp_opt),
-               escape_for_substitute_captures(config.target_codesign),
-               escape_for_substitute_captures(config.target_run_with_leaks))
-        )
     config.target_fail_simple_swift_parameterized = SubstituteCaptures(
         r"%%empty-directory(%%t) && "
         r"%s %s %%s \1 -o %%t/a.out -module-name main  && "
@@ -2512,9 +2495,6 @@ config.substitutions.append(('%target-run-simple-swiftgyb\(([^)]+)\)',
 config.substitutions.append(('%target-run-simple-swiftgyb', config.target_run_simple_swiftgyb))
 config.substitutions.append(('%target-run-simple-swift\(([^)]+)\)',
                             config.target_run_simple_swift_parameterized))
-if not kIsWindows:
-    config.substitutions.append(('%target-run-simple-leaks-swift\(([^)]+)\)',
-                                config.target_run_simple_leaks_swift_parameterized))
 config.substitutions.append(('%target-fail-simple-swift\(([^)]+)\)',
                             config.target_fail_simple_swift_parameterized))
 config.substitutions.append(('%target-run-stdlib-swift\(([^)]+)\)',