Skip to content

Revert "Revert "Revert "Disable module_deps_cache_reuse.swift test to unblock CI." and fix the test."" #37821

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
Jun 15, 2021

Conversation

artemcm
Copy link
Contributor

@artemcm artemcm commented Jun 7, 2021

And also make the test's pattern-matching of the problematic line a bit more robust.

@artemcm
Copy link
Contributor Author

artemcm commented Jun 7, 2021

@swift-ci please test

@artemcm artemcm requested a review from nkcsgexi June 7, 2021 20:45
@artemcm
Copy link
Contributor Author

artemcm commented Jun 10, 2021

@swift-ci please test

@@ -114,7 +111,7 @@ import SubE
// CHECK-NEXT: "-frontend"
// CHECK-NEXT: "-only-use-extra-clang-opts"
// CHECK-NEXT: "-Xcc"
// CHECK-NEXT: "clang"
// CHECK-NEXT: "{{.*}}clang"
Copy link
Member

Choose a reason for hiding this comment

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

Im not sure if this is the right thing to do - we really want to ensure that the correct clang is invoked (normally BUILD_DIR/clang).

@artemcm artemcm force-pushed the RevertRevertRevertRevertCacheTest branch from 128ad50 to 61b704a Compare June 14, 2021 17:19
@artemcm
Copy link
Contributor Author

artemcm commented Jun 14, 2021

@swift-ci please test

@artemcm
Copy link
Contributor Author

artemcm commented Jun 14, 2021

@swift-ci please test Windows platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 61b704a

@artemcm
Copy link
Contributor Author

artemcm commented Jun 14, 2021

@swift-ci please test Linux platform

@artemcm artemcm merged commit 0b1999f into swiftlang:main Jun 15, 2021
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.

4 participants