Skip to content

run test for vxWorks in 'pure' static linking mode by default; #10

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 2 commits into from
Aug 29, 2019

Conversation

BaoshanPang
Copy link

if environment variables 'RUST_TEST_DYLINK' is set to 1, then run test in 'pure' dynamic linking mode

revise the code in a more vxworks specific way, I am hoping this can make the upstreaming easier.

r? @n-salim

@@ -1999,7 +2022,8 @@ impl<'test> TestCx<'test> {
}

if !is_rustdoc {
if self.config.target == "wasm32-unknown-unknown" {
if self.config.target == "wasm32-unknown-unknown"
|| self.is_vxworks_pure_static() {
Copy link

Choose a reason for hiding this comment

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

Weirdly the rust sources don't seem to use a consistent formatting convention! However let's try to be self consistent. Based on other files I think the indentation you used at line 2072 should also be used here, i.e.

if xxx
    || yyy

if environment variables 'RUST_TEST_DYLINK' is set to 1, then run test in 'pure' dynamic linking mode
n-salim
n-salim previously approved these changes Aug 29, 2019
@BaoshanPang
Copy link
Author

@n-salim
Please approve it again. It seems I should merge the code before you approve it.

@BaoshanPang BaoshanPang merged commit 964c37c into master Aug 29, 2019
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