Skip to content
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

[testing] Workaround unsorted output #32313

Merged
merged 1 commit into from
Jun 12, 2020

Conversation

davezarzycki
Copy link
Contributor

master-next seems to sort the output differently.

@davezarzycki davezarzycki changed the base branch from master-next to master June 11, 2020 11:44
@davezarzycki
Copy link
Contributor Author

@swift-ci please smoke test

@CodaFi
Copy link
Contributor

CodaFi commented Jun 11, 2020

Is it really non-deterministic which ordering you get? I would expect the message about the build record to at least be consistent.

Copy link
Contributor

@davidungar davidungar left a comment

Choose a reason for hiding this comment

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

It's OK for me to merge, but it would be nice to hear from @slavapestov

The driver should be deterministic, scheduling according to the input files on the command line. @slavapestov , could the observed nondeterminism have anything to do with your recent changes?

Copy link
Contributor

@davidungar davidungar left a comment

Choose a reason for hiding this comment

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

Since you're external, you might need my approval to unblock.

@davezarzycki davezarzycki merged commit 8d79ec1 into swiftlang:master Jun 12, 2020
@davezarzycki davezarzycki deleted the pr32313 branch June 12, 2020 10:37
@davezarzycki
Copy link
Contributor Author

Thanks guys, for reference:

/home/dave/s/n/swift/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift:10:17: error: CHECK-FIRST: expected string not found in input
// CHECK-FIRST: Disabling incremental build: could not read build record
                ^
<stdin>:9:1: note: scanning from here

^

Input file: <stdin>
Check file: /home/dave/s/n/swift/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift

-dump-input=help describes the format of the following dump.

Full input was:
<<<<<<
          1: Swift version 5.3-dev (LLVM fcd50f9b80, Swift 546d331e22)
          2: Target: x86_64-unknown-linux-gnu
          3: Incremental compilation could not read build record.
          4: Disabling incremental build: could not read build record
          5: /usr/bin/python2.7 SOURCE_DIR/test/Driver/PrivateDependencies/Inputs/update-dependencies.py /home/dave/b/n/t/bin/swift-dependency-tool -frontend -c -primary-file ./main.swift ./other.swift -emit-reference-dependencies-path ./main.swiftdeps -target x86_64-unknown-linux-gnu -disable-objc-interop -module-cache-path /home/dave/b/n/t/swift-test-results/x86_64-unknown-linux-gnu/clang-module-cache -swift-version 4 -enable-direct-intramodule-dependencies -ignore-module-source-info -module-name main -o ./main.o
          6: Handled main.swift
          7: /usr/bin/python2.7 SOURCE_DIR/test/Driver/PrivateDependencies/Inputs/update-dependencies.py /home/dave/b/n/t/bin/swift-dependency-tool -frontend -c ./main.swift -primary-file ./other.swift -emit-reference-dependencies-path ./other.swiftdeps -target x86_64-unknown-linux-gnu -disable-objc-interop -module-cache-path /home/dave/b/n/t/swift-test-results/x86_64-unknown-linux-gnu/clang-module-cache -swift-version 4 -enable-direct-intramodule-dependencies -ignore-module-source-info -module-name main -o ./other.o
          8: Handled other.swift
          9: 
check:10     X error: no match found
>>>>>>

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