[android] adb_test_runner.py pushes file arguments. #19949
Merged
Conversation
This file contains hidden or 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
drodriguez
added a commit
to drodriguez/swift
that referenced
this pull request
Oct 23, 2018
At least test_rth.swift is checking the name of the executable during the test, so renaming every executable to __executable in Android will never work. Also, during the rth tool execution, all the results from before and after are pushed for every test. Since Android copies the passed files without relative paths, the library files will overwrite each other, making the test fail. Depends on swiftlang#19949 (more or less)
Some tests need more than just the executable to be pushed. For example the resilience tests need the executable and the linked library to be pushed. adb_test_runner.py only pushed the executable. The changes look into the arguments passed to the executable and figure out which ones refer to files. Those files are pushed to the device and transformed to refer to the path on the device instead (the resilience test do not actually use the argument values themselves, but maybe others do).
drodriguez
force-pushed
the
android-adb_test_runner-pushes-arguments
branch
from
91bae15 to
bf10e0b
Compare
compnerd
approved these changes
Oct 24, 2018
|
@swift-ci please test and merge |
|
I’m quite sure the error in OS X is unrelated. Can we rerun the OS X again? |
|
@swift-ci please test macOS platform |
jrose-apple
pushed a commit
that referenced
this pull request
Nov 2, 2018
At least test_rth.swift is checking the name of the executable during the test, so renaming every executable to __executable in Android will never work. Also, during the rth tool execution, all the results from before and after are pushed for every test. Since Android copies the passed files without relative paths, the library files will overwrite each other, making the test fail. Depends on #19949 (more or less)
milseman
pushed a commit
to milseman/swift
that referenced
this pull request
Nov 4, 2018
…g#19960) At least test_rth.swift is checking the name of the executable during the test, so renaming every executable to __executable in Android will never work. Also, during the rth tool execution, all the results from before and after are pushed for every test. Since Android copies the passed files without relative paths, the library files will overwrite each other, making the test fail. Depends on swiftlang#19949 (more or less)
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.
Some tests need more than just the executable to be pushed. For
example the resilience tests need the executable and the linked
library to be pushed. adb_test_runner.py only pushed the
executable.
The changes look into the arguments passed to the executable
and figure out which ones refer to files. Those files are pushed
to the device and transformed to refer to the path on the device
instead (the resilience test do not actually use the argument
values themselves, but maybe others do).
This PR might conflict with #19940, since both touch the same parts of the file, but both of them are complementary and should work at the same time.