Skip to content

[clang] Fix darwin-related tests' REQUIRES annotation #130138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2025
Merged

[clang] Fix darwin-related tests' REQUIRES annotation #130138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38416f4
[clang] Fix darwin-related tests' REQUIRES annotation
pratlucas Mar 6, 2025
e135e49
fixup! [clang] Fix darwin-related tests' REQUIRES annotation
pratlucas Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/test/Driver/apple-arm64-arch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: env SDKROOT="/" %clang -arch arm64 -c -### %s 2>&1 | \
// RUN: FileCheck %s
//
// REQUIRES: system-darwin
// REQUIRES: system-darwin && target={{.*}}-{{darwin|macos}}{{.*}}
//
// CHECK: "-triple" "arm64-apple-macosx{{[0-9.]+}}"
2 changes: 1 addition & 1 deletion clang/test/Driver/compilation_database_multiarch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// REQUIRES: system-darwin
// REQUIRES: system-darwin && target={{.*}}-{{darwin|macos}}{{.*}}

// RUN: rm -rf %t && mkdir -p %t
// RUN: %clang -fdriver-only -o %t/out %s -mtargetos=macos12 -arch arm64 -arch x86_64 -MJ %t/compilation_database.json
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Driver/darwin-ld-platform-version-macos-requires-darwin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

// CHECK: "-platform_version" "macos" "{{[0-9]+}}.0.0" "{{[0-9]+}}.{{[0-9]+}}"

// REQUIRES: system-darwin
// REQUIRES: system-darwin && target={{.*}}-{{darwin|macos}}{{.*}}
2 changes: 1 addition & 1 deletion clang/test/Driver/mtargetos-darwin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// RUN: not %clang -mtargetos=darwin20 -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=INVALIDOS %s
// RUN: not %clang -mtargetos=ios -arch arm64 -c %s -o %t.o -### 2>&1 | FileCheck --check-prefix=NOVERSION %s

// REQUIRES: system-darwin
// REQUIRES: system-darwin && target={{.*}}-{{darwin|macos}}{{.*}}

// MACOS: "-cc1" "-triple" "arm64-apple-macosx11.0.0"
// MACOS-NEXT: "-cc1" "-triple" "x86_64-apple-macosx11.0.0"
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Driver/xros-driver-requires-darwin-host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// REQUIRES: system-darwin
// REQUIRES: system-darwin && target={{.*}}-{{darwin|macos}}{{.*}}

// RUN: env XROS_DEPLOYMENT_TARGET=1.0 %clang -arch arm64 -c -### %s 2>&1 | FileCheck %s

Expand Down
2 changes: 1 addition & 1 deletion clang/test/Index/pch-from-libclang.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// RUN: c-index-test -test-load-source local %s -include %t.clang.h -fmodules -fmodules-cache-path=%t.mcp -Xclang -triple -Xclang x86_64-apple-darwin | FileCheck %s

// FIXME: Still fails on at least some linux boxen.
// REQUIRES: system-darwin
// REQUIRES: system-darwin && target={{.*}}-{{darwin|macos}}{{.*}}

#ifndef HEADER
#define HEADER
Expand Down