about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKeegan McAllister <kmcallister@mozilla.com>2014-10-09 21:26:51 -0700
committerKeegan McAllister <kmcallister@mozilla.com>2014-10-09 21:26:51 -0700
commitbc3831b7303b10781327d270dca2524cefdbff3d (patch)
treea0cec96304379293cd1ddca8c4c4c5b8bd3f26df
parent441796831f9d57dbb336805b7ddee5097c407d58 (diff)
downloadrust-bc3831b7303b10781327d270dca2524cefdbff3d.tar.gz
rust-bc3831b7303b10781327d270dca2524cefdbff3d.zip
Disable no-stack-check test on Windows
-rw-r--r--src/test/run-make/no-stack-check/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/test/run-make/no-stack-check/Makefile b/src/test/run-make/no-stack-check/Makefile
index 63f057d35c4..561056d719e 100644
--- a/src/test/run-make/no-stack-check/Makefile
+++ b/src/test/run-make/no-stack-check/Makefile
@@ -1,5 +1,6 @@
 -include ../tools.mk
 
+ifndef IS_WINDOWS
 all:
 	$(RUSTC) -O --emit asm attr.rs
 	! grep -q morestack $(TMPDIR)/attr.s
@@ -7,3 +8,8 @@ all:
 	grep -q morestack $(TMPDIR)/flag.s
 	$(RUSTC) -O --emit asm -C no-stack-check flag.rs
 	! grep -q morestack $(TMPDIR)/flag.s
+else
+# On Windows we use __chkstk and it only appears in functions with large allocations,
+# so this test wouldn't be reliable.
+all:
+endif