Skip to content

Commit

Permalink
Prevent unoptimized rustpkg tests from running out of stack.
Browse files Browse the repository at this point in the history 
The actual fix would be to make rustpkg use `rustc::monitor` so it picks
up anything special that rustc needs, but for now let's keep the tests
from breaking.
  • Loading branch information
@jld
jld committed Oct 29, 2013
1 parent 49f851c commit c0190a9
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions mk/tests.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,17 @@ $(foreach host,$(CFG_HOST_TRIPLES), \
$(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate))) \
))))))

# FIXME (#10104): Raise the stack size to work around rustpkg bypassing
# the code in rustc that would take care of it.
define DEF_RUSTPKG_STACK_FIX
$$(call TEST_OK_FILE,$(1),$(2),$(3),rustpkg): export RUST_MIN_STACK=8000000
endef

$(foreach host,$(CFG_HOST_TRIPLES), \
$(foreach target,$(CFG_TARGET_TRIPLES), \
$(foreach stage,$(STAGES), \
$(eval $(call DEF_RUSTPKG_STACK_FIX,$(stage),$(target),$(host))))))


######################################################################
# Rules for the compiletest tests (rpass, rfail, etc.)
Expand Down

4 comments on commit c0190a9

@bors
Copy link
Contributor

@bors bors commented on c0190a9 Oct 30, 2013

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at jld@c0190a9

@bors
Copy link
Contributor

@bors bors commented on c0190a9 Oct 30, 2013

Choose a reason for hiding this comment

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

merging jld/rust/enum-discrim-size.r0 = c0190a9 into auto

@bors
Copy link
Contributor

@bors bors commented on c0190a9 Oct 30, 2013

Choose a reason for hiding this comment

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

jld/rust/enum-discrim-size.r0 = c0190a9 merged ok, testing candidate = d05fbf82

@bors
Copy link
Contributor

@bors bors commented on c0190a9 Oct 30, 2013

Choose a reason for hiding this comment

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

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1343
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2233
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/79
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/79
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2237
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1343
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1342
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2251
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1343
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1343
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2252
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1343
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1343
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2236
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1341
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/2017

Please sign in to comment.