diff options
| author | bors <bors@rust-lang.org> | 2015-04-18 14:38:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-18 14:38:44 +0000 |
| commit | a81ce5f991148b3c701c6b4276cdcafe366cd8f4 (patch) | |
| tree | 817a8e1dccc3e46e565d4692a526824a788aa49d | |
| parent | fcf637b19f1a94dcf1748b8b29fca100f150eb0a (diff) | |
| parent | 1dee7b0160fd708c8d5ccc6be5099f40e9d3bbba (diff) | |
| download | rust-a81ce5f991148b3c701c6b4276cdcafe366cd8f4.tar.gz rust-a81ce5f991148b3c701c6b4276cdcafe366cd8f4.zip | |
Auto merge of #24528 - tamird:valgrind-sched, r=alexcrichton
r? @brson
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | mk/platform.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index ec5c099372b..8fc66a764da 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,7 +76,7 @@ # # * `CFG_ENABLE_VALGRIND=1` - Run tests under valgrind # * `VALGRIND_COMPILE=1` - Run the compiler itself under valgrind -# (may require `CFG_ENABLE_VALGRIND`) +# (requires `CFG_ENABLE_VALGRIND`) # # * `NO_REBUILD=1` - Don't rebootstrap when testing std # (and possibly other crates) diff --git a/mk/platform.mk b/mk/platform.mk index cd86b273c6d..9545a1fb52d 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -46,8 +46,9 @@ endif # see https://blog.mozilla.org/jseward/2012/06/05/valgrind-now-supports-jemalloc-builds-directly/ ifdef CFG_VALGRIND CFG_VALGRIND += --error-exitcode=100 \ - --soname-synonyms=somalloc=NONE \ + --fair-sched=try \ --quiet \ + --soname-synonyms=somalloc=NONE \ --suppressions=$(CFG_SRC_DIR)src/etc/x86.supp \ $(OS_SUPP) ifdef CFG_ENABLE_HELGRIND |