Skip to content

[BatchMode] Make driver report exits per-batch, not per-constituent. #14931

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 3 commits into from
Mar 3, 2018

Conversation

graydon
Copy link
Contributor

@graydon graydon commented Mar 2, 2018

I was overzealous in the amount of work I made the driver do on a per-constituent basis when a task exits. The driver's model of the task should be per-constituent, but the Pid-based reporting and output-writing should happen per-batch.

(And doing anything in the signalling patch per-constituent is pointless; it only does one thing).

This is required to run batch mode correctly under xcodebuild, or in general anything reading parseable-output. And it's required to make sense of the output in any case.

(And with this change, substantial parts of the source compat suite build in batch mode)

@graydon graydon requested a review from jrose-apple March 2, 2018 08:35
@graydon
Copy link
Contributor Author

graydon commented Mar 2, 2018

@swift-ci please test

@graydon
Copy link
Contributor Author

graydon commented Mar 2, 2018

(@jrose-apple I know this should have its own dedicated test; I'll try to write one tomorrow, a bit late for it tonight)

@jrose-apple
Copy link
Contributor

Yes, test please! And how does this appear in Xcode's build log? (Maybe attach a screenshot of Xcode 9.3b3, if that handles it well enough?)

Copy link
Contributor

@jrose-apple jrose-apple left a comment

Choose a reason for hiding this comment

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

If this works for Xcode then it works for me!

@graydon
Copy link
Contributor Author

graydon commented Mar 2, 2018

@jrose-apple It doesn't look fantastic in that, like with WMO, you no longer see the individual files, but it's not so bad; just looks like "multiple instances of WMO".

screen shot 2018-03-02 at 11 17 48 am

@graydon
Copy link
Contributor Author

graydon commented Mar 2, 2018

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Mar 2, 2018

Build failed
Swift Test OS X Platform
Git Sha - 7981714

@swift-ci
Copy link
Contributor

swift-ci commented Mar 2, 2018

Build failed
Swift Test Linux Platform
Git Sha - 7981714

@graydon
Copy link
Contributor Author

graydon commented Mar 2, 2018

@swift-ci please test Linux platform

@swift-ci
Copy link
Contributor

swift-ci commented Mar 2, 2018

Build failed
Swift Test Linux Platform
Git Sha - 5edded1

@graydon
Copy link
Contributor Author

graydon commented Mar 2, 2018

@swift-ci please test

@graydon graydon merged commit a9b49a9 into swiftlang:master Mar 3, 2018
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.

3 participants