about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-06-07 16:48:08 +0200
committerGitHub <noreply@github.com>2019-06-07 16:48:08 +0200
commit06a1df4954eca5053e64677da821bce3cc52b80f (patch)
tree751f4cda6641d4eccc93308f2bf87563610548b0 /src/libstd
parent5557bd0b1eb4dfa7b21fc625dfb0a1a599acdfe8 (diff)
parent9a498419615600741d6c29fb3ace4e31a1831efa (diff)
downloadrust-06a1df4954eca5053e64677da821bce3cc52b80f.tar.gz
rust-06a1df4954eca5053e64677da821bce3cc52b80f.zip
Rollup merge of #61603 - Goirad:increase-sgx-heapsize, r=alexcrichton
Increases heap size available during testing for SGX

PR [61540](https://github.com/rust-lang/rust/pull/61540) causes at least one test to fail when run for the SGX platform due to lack of memory. This PR increases the heapsize available during tests, which is a good thing regardless of the status of that PR.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/Cargo.toml2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 9abad83fdb0..30e23f1007f 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -87,3 +87,5 @@ std_detect_dlsym_getauxval = []
 [package.metadata.fortanix-sgx]
 # Maximum possible number of threads when testing
 threads = 125
+# Maximum heap size
+heap_size = 0x8000000