@@ -1010,7 +1010,7 @@ else:
10101010swift_reflection_test_name = 'swift-reflection-test' + variant_suffix
10111011
10121012def use_interpreter_for_simple_runs ():
1013- def make_simple_target_run (gyb = False , stdlib = False , parameterized = False , leaks = False ):
1013+ def make_simple_target_run (gyb = False , stdlib = False , parameterized = False ):
10141014 result = ''
10151015 if gyb :
10161016 result += ('%empty-directory(%t) && '
@@ -1038,7 +1038,6 @@ def use_interpreter_for_simple_runs():
10381038 config .target_run_stdlib_swift = make_simple_target_run (stdlib = True )
10391039 config .target_run_simple_swift = make_simple_target_run ()
10401040 config .target_run_simple_swift_parameterized = make_simple_target_run (parameterized = True )
1041- config .target_run_simple_leaks_swift_parameterized = make_simple_leaks_target_run (parameterized = True )
10421041 config .target_run_stdlib_swift_parameterized = make_simple_target_run (stdlib = True , parameterized = True )
10431042 config .target_run_simple_swiftgyb_parameterized = make_simple_target_run (gyb = True , parameterized = True )
10441043 config .available_features .add ('interpret' )
@@ -2278,11 +2277,6 @@ elif not kIsWindows:
22782277 lit_config .note ('Testing with the just-built libraries' )
22792278
22802279 lit_config .note ('Library load path: {0}' .format (os .path .pathsep .join (target_stdlib_path )))
2281- config .target_run_with_leaks = (
2282- "/usr/bin/env " +
2283- construct_library_path_env (target_stdlib_path ) +
2284- " xcrun leaks -atExit -- " +
2285- config .target_run )
22862280 config .target_run = (
22872281 "/usr/bin/env " +
22882282 construct_library_path_env (target_stdlib_path ) +
@@ -2318,16 +2312,6 @@ if not getattr(config, 'target_run_simple_swift', None):
23182312 escape_for_substitute_captures (config .target_codesign ),
23192313 escape_for_substitute_captures (config .target_run ))
23202314 )
2321- config .target_run_simple_leaks_swift_parameterized = SubstituteCaptures (
2322- r"%%empty-directory(%%t) && "
2323- r"%s %s %%s \1 -o %%t/a.out -module-name main && "
2324- r"%s %%t/a.out && "
2325- r"%s %%t/a.out"
2326- % (escape_for_substitute_captures (config .target_build_swift ),
2327- escape_for_substitute_captures (mcp_opt ),
2328- escape_for_substitute_captures (config .target_codesign ),
2329- escape_for_substitute_captures (config .target_run_with_leaks ))
2330- )
23312315 config .target_fail_simple_swift_parameterized = SubstituteCaptures (
23322316 r"%%empty-directory(%%t) && "
23332317 r"%s %s %%s \1 -o %%t/a.out -module-name main && "
@@ -2503,8 +2487,6 @@ config.substitutions.append(('%target-run-simple-swiftgyb\(([^)]+)\)',
25032487config .substitutions .append (('%target-run-simple-swiftgyb' , config .target_run_simple_swiftgyb ))
25042488config .substitutions .append (('%target-run-simple-swift\(([^)]+)\)' ,
25052489 config .target_run_simple_swift_parameterized ))
2506- config .substitutions .append (('%target-run-simple-leaks-swift\(([^)]+)\)' ,
2507- config .target_run_simple_leaks_swift_parameterized ))
25082490config .substitutions .append (('%target-fail-simple-swift\(([^)]+)\)' ,
25092491 config .target_fail_simple_swift_parameterized ))
25102492config .substitutions .append (('%target-run-stdlib-swift\(([^)]+)\)' ,
0 commit comments