[android] Pass test environment variables to Android device. #19940
+11
−3
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
When running tests in an Android device, the environment variables were not passed to the device, which make some test fail, like stdlib/HashingRandomization that test with and without the environment variable SWIFT_DETERMINISTIC_HASHING. The changes implement a process similar to what the iOS simulator already seem to do: a variable prefix which is pick up by the adb_test_runner.py and send to the device for the test.
compnerd
reviewed
Oct 22, 2018
| @@ -932,7 +932,8 @@ SIMULATOR_ENV_PREFIX = 'SIMCTL_CHILD_' | |||
| ENV_VAR_PREFIXES = { | |||
| 'iphonesimulator': SIMULATOR_ENV_PREFIX, | |||
| 'watchsimulator': SIMULATOR_ENV_PREFIX, | |||
| 'appletvsimulator': SIMULATOR_ENV_PREFIX | |||
| 'appletvsimulator': SIMULATOR_ENV_PREFIX, | |||
| 'android': 'ANDROID_CHILD_' | |||
There was a problem hiding this comment.
Where does the prefix come from? Is there something special about it?
There was a problem hiding this comment.
Nothing special, except that it has to match here and in the script that invokes the binary on the Android device. The contents are more or less following the iOS simulator one, but that’s not necessary.
There was a problem hiding this comment.
Oh, I see, rather than create a new variable, you just inlined it. That makes sense.
|
@swift-ci please test and merge |
compnerd
approved these changes
Oct 24, 2018
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.
When running tests in an Android device, the environment variables
were not passed to the device, which make some test fail, like
stdlib/HashingRandomization that test with and without the
environment variable SWIFT_DETERMINISTIC_HASHING.
The changes implement a process similar to what the iOS simulator
already seem to do: a variable prefix which is pick up by the
adb_test_runner.py and send to the device for the test.
Besides that, to make the test pass, the test runner will not print the standard out with an extra newline at the end (from the Python
print). This should make the output match the rest of the platforms more closely.