Show version mismatch in -driver-show-incremental #5308
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jrose-apple
approved these changes
Oct 17, 2016
| // RUN: echo '{version: "bogus", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps | ||
| // RUN: cd %t && %swiftc_driver -driver-use-frontend-path %S/Inputs/update-dependencies.py -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-VERSION-MISMATCH %s | ||
| // CHECK-VERSION-MISMATCH: Incremental compilation has been disabled | ||
| // CHECK-VERSION-MISMATCH: Compiling with: Swift version {{[0-9]}} |
There was a problem hiding this comment.
Can you match this line a little less aggressively? Xcode Swift has "Apple" stuck in the front, and I could see similar customizations from other vendors in the future. Just matching "Compiling with:" is probably good enough (possibly using FileCheck's -NEXT feature to check that they're on successive lines).
SR-2855 suggests `-driver-show-incremental` not only print information about why certain files are included in incremental compilation, but also print out why incremental compilation may be disabled altogether. Add a message for one such reason: when the version of the Swift compiler being used to incrementally compile doesn't match the one used to compile previously.
modocache
force-pushed
the
sr-2855-driver-show-incremental-version
branch
from
4064883
to
88ac618
Compare
|
@swift-ci please test and merge |
modocache
force-pushed
the
sr-2855-driver-show-incremental-version
branch
from
8cb4bdd
to
88ac618
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SR-2855 suggests
-driver-show-incrementalnot only print information about why certain files are included in incremental compilation, but also print out why incremental compilation may be disabled altogether.Add a message for one such reason: when the version of the Swift compiler being used to incrementally compile doesn't match the one used to compile previously.
This addresses one part of SR-2855.