Skip to content

Commit d9b062a

Browse files
author
Julian Lettner
committed
[TSan][Darwin] Remove unnecessary lit substitution
We don't test on very old versions of Apple platforms anymore. The following lit substitution concerning the minimum deployment target for ARC support can be removed. ``` %darwin_min_target_with_full_runtime_arc_support -> 10.11 ``` Differential Revision: https://reviews.llvm.org/D85803
1 parent 8372e47 commit d9b062a

7 files changed

+7
-9
lines changed

compiler-rt/test/lit.common.cfg.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,7 @@
268268
# to the macOS version that first contained the relevant feature.
269269
darwin_min_deployment_target_substitutions = {
270270
'%macos_min_target_10_11': '10.11',
271-
# rdar://problem/22207160
272-
'%darwin_min_target_with_full_runtime_arc_support': '10.11',
273-
'%darwin_min_target_with_tls_support': '10.12',
271+
'%darwin_min_target_with_tls_support': '10.12', # TLS requires watchOS 3+ simulator
274272
}
275273

276274
if config.host_os == 'Darwin':

compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_tsan %s -lc++ -fobjc-arc -lobjc -o %t -framework Foundation %darwin_min_target_with_full_runtime_arc_support
1+
// RUN: %clang_tsan %s -lc++ -fobjc-arc -lobjc -o %t -framework Foundation
22
// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s
33

44
// Check that we do not report races between:

compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
1+
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
22
// RUN: %run %t 6 2>&1 | FileCheck %s --check-prefix=SIX
33
// RUN: not %run %t 7 2>&1 | FileCheck %s --check-prefix=SEVEN
44

compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
1+
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
22
// RUN: not %run %t 2>&1 | FileCheck %s
33
// RUN: %env_tsan_opts=detect_deadlocks=1 not %run %t 2>&1 | FileCheck %s
44
// RUN: %env_tsan_opts=detect_deadlocks=0 %run %t 2>&1 | FileCheck %s --check-prefix=DISABLED

compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
1+
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
22
// RUN: %run %t 2>&1 | FileCheck %s
33

44
#import <Foundation/Foundation.h>

compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
1+
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
22
// RUN: %run %t 2>&1 | FileCheck %s
33

44
#import <Foundation/Foundation.h>

compiler-rt/test/tsan/Darwin/objc-synchronize.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
1+
// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
22
// RUN: %run %t 2>&1 | FileCheck %s
33

44
#import <Foundation/Foundation.h>

0 commit comments

Comments
 (0)