Skip to content

[Test] Fix and re-enable test to account for change in clang dependency scanner results #81681

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

Conversation

artemcm
Copy link
Contributor

@artemcm artemcm commented May 21, 2025

Due to changes in (swiftlang/llvm-project#10679)

@artemcm artemcm requested a review from jansvoboda11 May 21, 2025 16:30
@artemcm
Copy link
Contributor Author

artemcm commented May 21, 2025

@swift-ci smoke test

@artemcm artemcm enabled auto-merge May 21, 2025 16:30
@@ -54,6 +52,7 @@ import ImportsMacroSpecificClangModule
// CHECK-NEXT: "sourceFiles": [
// CHECK-DAG: "{{.*}}OnlyWithMacro.h"
// CHECK-DAG: "{{.*}}module.modulemap"
// CHECK-DAG: "{{.*}}SDKSettings.json"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this make the test platform specific? I opted for another approach here: #81620

@artemcm artemcm force-pushed the ReEnableClangArgsSDKSettingsFileTest branch from 4e6c4fb to c18fd43 Compare May 21, 2025 16:36
@artemcm
Copy link
Contributor Author

artemcm commented May 21, 2025

@swift-ci smoke test

@artemcm artemcm force-pushed the ReEnableClangArgsSDKSettingsFileTest branch from c18fd43 to a1bef84 Compare May 21, 2025 17:02
@artemcm
Copy link
Contributor Author

artemcm commented May 21, 2025

@swift-ci smoke test

@artemcm artemcm force-pushed the ReEnableClangArgsSDKSettingsFileTest branch from a1bef84 to 35e4fa8 Compare May 21, 2025 17:03
@artemcm
Copy link
Contributor Author

artemcm commented May 21, 2025

@swift-ci smoke test

@artemcm artemcm merged commit c4ee4d9 into swiftlang:main May 21, 2025
3 checks passed
hamishknight added a commit to hamishknight/swift that referenced this pull request May 22, 2025
…ArgsSDKSettingsFileTest"

This reverts commit c4ee4d9.
@artemcm artemcm deleted the ReEnableClangArgsSDKSettingsFileTest branch May 22, 2025 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants