Skip to content

Commit dc195bd

Browse files
committed
Mark failing tests with CLANG_USE_XCSELECT as XFAIL
1 parent 7e9bbf7 commit dc195bd

17 files changed

+49
-13
lines changed

clang/lib/Driver/ToolChains/Darwin.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,15 +2272,11 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
22722272
}
22732273
#ifdef CLANG_USE_XCSELECT
22742274
else if (getTriple().isMacOSX()) {
2275-
const char *env = ::getenv("CLANG_NO_XCSELECT");
2276-
2277-
if (!env || !*env) {
2278-
char *p;
2279-
if (!::xcselect_host_sdk_path(CLANG_XCSELECT_HOST_SDK_POLICY, &p)) {
2280-
Args.append(Args.MakeSeparateArg(
2281-
nullptr, Opts.getOption(options::OPT_isysroot), p));
2282-
::free(p);
2283-
}
2275+
char *p;
2276+
if (!::xcselect_host_sdk_path(CLANG_XCSELECT_HOST_SDK_POLICY, &p)) {
2277+
Args.append(Args.MakeSeparateArg(
2278+
nullptr, Opts.getOption(options::OPT_isysroot), p));
2279+
::free(p);
22842280
}
22852281
}
22862282
#endif

clang/test/Driver/arc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// XFAIL: xcselect
2+
// FIXME: There's no reason why this should fail with CLANG_USE_XCSELECT.
3+
14
// RUN: not %clang -ObjC -target i386-apple-darwin10 -stdlib=libstdc++ -m32 -fobjc-arc %s -fsyntax-only 2>&1 | FileCheck %s
25
// RUN: not %clang -x objective-c -target i386-apple-darwin10 -stdlib=libstdc++ -m32 -fobjc-arc %s -fsyntax-only 2>&1 | FileCheck %s
36
// RUN: not %clang -x objective-c++ -target i386-apple-darwin10 -stdlib=libstdc++ -m32 -fobjc-arc %s -fsyntax-only 2>&1 | FileCheck %s

clang/test/Driver/clang-g-opts.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// XFAIL: xcselect
2+
// FIXME: There's no reason why this should fail with CLANG_USE_XCSELECT.
3+
14
// RUN: %clang -### -S %s 2>&1 | FileCheck --check-prefix=CHECK-WITHOUT-G %s
25
// RUN: %clang -### -S %s -g -target x86_64-linux-gnu 2>&1 \
36
// RUN: | FileCheck --check-prefix=CHECK-WITH-G %s

clang/test/Driver/clang-translation.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// XFAIL: xcselect
2+
// FIXME: There's no reason why this should fail with CLANG_USE_XCSELECT.
3+
14
// RUN: %clang -target i386-unknown-unknown -### -S -O0 -Os %s -o %t.s -fverbose-asm -fvisibility=hidden 2>&1 | FileCheck -check-prefix=I386 %s
25
// I386: "-triple" "i386-unknown-unknown"
36
// I386: "-S"

clang/test/Driver/darwin-builtin-modules.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// XFAIL: xcselect
2+
// FIXME: There's no reason why this should fail with CLANG_USE_XCSELECT.
3+
14
// Check that darwin passes -fbuiltin-headers-in-system-modules
25
// when expected.
36

clang/test/Driver/darwin-debug-flags.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// XFAIL: xcselect
2+
// FIXME: There's no reason why this should fail with CLANG_USE_XCSELECT.
3+
14
// RUN: env RC_DEBUG_OPTIONS=1 %clang -target i386-apple-darwin11 -I "path with \spaces" -g -Os %s -emit-llvm -S -o - | FileCheck %s
25
// RUN: touch %t.s
36
// RUN: env RC_DEBUG_OPTIONS=1 %clang -### -target i386-apple-darwin11 -c -g %t.s 2>&1 | FileCheck -check-prefix=S %s

clang/test/Driver/darwin-header-search-system.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// UNSUPPORTED: system-windows
2+
// XFAIL: xcselect
3+
// FIXME: There's no reason why this should fail with CLANG_USE_XCSELECT.
24

35
// General tests that the system header search paths detected by the driver
46
// and passed to CC1 are correct on Darwin platforms.

clang/test/Driver/darwin-ld-platform-version-macos.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// XFAIL: xcselect
2+
// FIXME: There's no reason why this should fail with CLANG_USE_XCSELECT.
3+
14
// RUN: touch %t.o
25

36
// RUN: %clang -target x86_64-apple-macos10.13 -fuse-ld=lld \

clang/test/Driver/darwin-ld.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// XFAIL: xcselect
2+
// FIXME: There's no reason why this should fail with CLANG_USE_XCSELECT.
3+
14
// Check that ld gets arch_multiple.
25

36
// RUN: %clang -target i386-apple-darwin9 -arch i386 -arch x86_64 %s -### -o foo 2> %t.log

clang/test/Driver/darwin-multiarch-arm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// XFAIL: xcselect
2+
// FIXME: There's no reason why this should fail with CLANG_USE_XCSELECT.
3+
14
// Check that we compile correctly with multiple ARM -arch options.
25
//
36
// RUN: %clang -target arm7-apple-darwin10 -### \

0 commit comments

Comments
 (0)