Skip to content

[android] Push test binaries w/o modifying executable name. #19960

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 1 commit into from
Nov 2, 2018

Conversation

drodriguez
Copy link
Contributor

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)

@modocache: I suppose that you might not remember why you renamed every binary to __executable, but I think that since the arguments end up in the text files, the length of the binary name should not be that important anymore. If you think it would be a problem, I might include an special case for the binaries pushed by the resilience tests (before_before, before_after, after_before, after_after).

@jrose-apple: I had to limit the glob from only one of the directories (before or after). I don’t think this would break the test, or invalidate the testing results. When testing before, the after directory would not be there, so trying to link against it would not find the library, failing the test. If you think this is not correct, I can try to modify #19949 to use relative paths, but it might get hairy.

@gottesmm
Copy link
Contributor

@drodriguez Just an FYI, JordanR is on vacation.

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)
@drodriguez drodriguez force-pushed the android-fix-test_rth branch from ab69e7d to c59e762 Compare October 23, 2018 18:49
Copy link
Contributor

@modocache modocache left a comment

Choose a reason for hiding this comment

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

I suppose that you might not remember why you renamed every binary to __executable, but I think that since the arguments end up in the text files, the length of the binary name should not be that important anymore.

I do vaguely recall the length of a test's name causing issues, but it was a while ago, and I can't really remember. Assuming the same tests in the suite pass with this change, it seems like a straightforward improvement to me -- thanks for working on this! 👍

@jrose-apple
Copy link
Contributor

@swift-ci Please test

@jrose-apple jrose-apple self-assigned this Oct 30, 2018
@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - ab69e7d4682b7fd904e1b64a3860ec3f181fa7ec

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - ab69e7d4682b7fd904e1b64a3860ec3f181fa7ec

@jrose-apple jrose-apple merged commit d3e5af6 into swiftlang:master Nov 2, 2018
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)
@drodriguez drodriguez deleted the android-fix-test_rth branch January 7, 2019 19:32
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.

5 participants