Skip to content

[HeaderSearch] Make a test independent of the local environment. #100011

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.

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 1 commit into from
Jul 23, 2024

Conversation

vsapsai
Copy link
Collaborator

@vsapsai vsapsai commented Jul 22, 2024

Don't ask the driver to inspect the local environment but use cc1 directly.

Don't ask the driver to inspect the local environment but use `cc1` directly.
@llvmbot llvmbot added clang Clang issues not falling into any other category clang:modules C++20 modules and Clang Header Modules labels Jul 22, 2024
@llvmbot
Copy link
Member

llvmbot commented Jul 22, 2024

@llvm/pr-subscribers-clang-modules

@llvm/pr-subscribers-clang

Author: Volodymyr Sapsai (vsapsai)

Changes

Don't ask the driver to inspect the local environment but use cc1 directly.


Full diff: https://github.com/llvm/llvm-project/pull/100011.diff

1 Files Affected:

  • (modified) clang/test/Modules/subdirectory-module-maps-working-dir.m (+2-2)
diff --git a/clang/test/Modules/subdirectory-module-maps-working-dir.m b/clang/test/Modules/subdirectory-module-maps-working-dir.m
index 4fb19ff05ef38..43488e8d13601 100644
--- a/clang/test/Modules/subdirectory-module-maps-working-dir.m
+++ b/clang/test/Modules/subdirectory-module-maps-working-dir.m
@@ -1,8 +1,8 @@
 // RUN: rm -rf %t
-// RUN: %clang -fsyntax-only -fmodules -fmodules-cache-path=%t \
+// RUN: %clang_cc1 -fsyntax-only -fmodules -fimplicit-module-maps -fmodules-cache-path=%t \
 // RUN:    -working-directory %S/Inputs \
 // RUN:    -I subdirectory-module-maps-working-dir \
-// RUN:    %s -Werror=implicit-function-declaration -Xclang -verify
+// RUN:    %s -Werror=implicit-function-declaration -verify
 
 @import ModuleInSubdir;
 

@vsapsai
Copy link
Collaborator Author

vsapsai commented Jul 22, 2024

Noticed inconsistencies after #100005 as I have pre-release Xcode locally.

@vsapsai
Copy link
Collaborator Author

vsapsai commented Jul 23, 2024

Failed test is unrelated "Profile-x86_64 :: check-same-common-code.test".

@vsapsai vsapsai merged commit df741b2 into llvm:main Jul 23, 2024
8 of 10 checks passed
@vsapsai vsapsai deleted the environment-independent-test branch July 23, 2024 18:26
yuxuanchen1997 pushed a commit that referenced this pull request Jul 25, 2024
…0011)

Summary:
Don't ask the driver to inspect the local environment but use `cc1`
directly.

Test Plan: 

Reviewers: 

Subscribers: 

Tasks: 

Tags: 


Differential Revision: https://phabricator.intern.facebook.com/D60250778
cyndyishida pushed a commit to cyndyishida/llvm-project that referenced this pull request Sep 4, 2024
…m#100011)

Don't ask the driver to inspect the local environment but use `cc1`
directly.

(cherry picked from commit df741b2)
cyndyishida pushed a commit to swiftlang/llvm-project that referenced this pull request Sep 4, 2024
…m#100011)

Don't ask the driver to inspect the local environment but use `cc1`
directly.

(cherry picked from commit df741b2)
vsapsai added a commit to swiftlang/llvm-project that referenced this pull request Oct 3, 2024
…m#100011)

Don't ask the driver to inspect the local environment but use `cc1`
directly.

rdar://136932241
(cherry picked from commit df741b2)
vsapsai added a commit to swiftlang/llvm-project that referenced this pull request Oct 3, 2024
…m#100011)

Don't ask the driver to inspect the local environment but use `cc1`
directly.

rdar://136932241
(cherry picked from commit df741b2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang:modules C++20 modules and Clang Header Modules clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants