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

More jemalloc fixes #38675

Merged
merged 2 commits into from
Jan 13, 2017
Merged

More jemalloc fixes #38675

merged 2 commits into from
Jan 13, 2017

Conversation

infinity0
Copy link
Contributor

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@infinity0 infinity0 force-pushed the more-jemalloc-fixes branch 2 times, most recently from 6aa7710 to 6ffa107 Compare December 29, 2016 14:33
@@ -10,7 +10,7 @@

#![feature(alloc_jemalloc)]

#[cfg(any(target_os = "linux", target_os = "macos"))]
#[cfg(any(all(target_os = "linux", not(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x"))), target_os = "macos"))]
Copy link
Member

Choose a reason for hiding this comment

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

This seems like it's getting out of hand, perhaps you can just configure the test to only run on x86_64 linux and OSX?

Copy link
Contributor

Choose a reason for hiding this comment

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

What is the point of a testsuite if you're not running it? If users of non-x86 platforms are supposed to disable the testsuite, they shouldn't be really trusting any of the generated binaries, to be honest.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In this particular case, we're simply disabling jemalloc-related tests that are not applicable on those platforms, because rust doesn't use jemalloc there. But in general, I do hope rust starts running tests on these other platforms too.

@@ -29,9 +29,9 @@ extern crate allocator_dylib2;
// ensure we get the same error.
//
// So long as we CI linux/OSX we should be good.
#[cfg(any(target_os = "linux", target_os = "macos"))]
#[cfg(any(all(target_os = "linux", not(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x"))), target_os = "macos"))]
Copy link
Member

Choose a reason for hiding this comment

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

This also seems like it's getting out of hand, can we configure this to basically only run the test on x86_64 linux and OSX as well?

@nikomatsakis
Copy link
Contributor

This seems reasonable to me (modulo @alexcrichton's comment), though this code is not really my area of expertise.

@nikomatsakis
Copy link
Contributor

r=me once @alexcrichton is satisfied, so:

r? @alexcrichton

@brson
Copy link
Contributor

brson commented Dec 30, 2016

Thanks for keeping these platforms running @infinity0

@infinity0
Copy link
Contributor Author

Updated to specifically enable on x86 and x86_64 only. (I did it the other way around originally to match what is done in librustc_back - which defaults to jemalloc and specifically disables it for all those other arches.) But anyway, this won't matter much once #36963 is done.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 12, 2017

📌 Commit cadebc7 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 13, 2017

⌛ Testing commit cadebc7 with merge 1a2ed98...

bors added a commit that referenced this pull request Jan 13, 2017
More jemalloc fixes

- Disable jemalloc on s390x as well (closes #38596)
- Disable jemalloc tests on platforms where it is disabled (closes #38612)
@bors
Copy link
Contributor

bors commented Jan 13, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 1a2ed98 to master...

@bors bors merged commit cadebc7 into rust-lang:master Jan 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants