summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-10-09 10:47:38 +0800
committerJohn Hodge <tpg@mutabah.net>2016-10-09 10:47:38 +0800
commitbaaca746b480d0ede1c15ae24327f57475d04353 (patch)
tree29d39d03219f9bfc81e565b71d5a370015586423
parent0241926381c1f069f1b1cfd8e46288e86c49f125 (diff)
downloadmrust-baaca746b480d0ede1c15ae24327f57475d04353.tar.gz
Makefile - Disable compile-fail tests, allow run-pass and run-fail tests to reach resolve
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index def10c5b..bbe141d8 100644
--- a/Makefile
+++ b/Makefile
@@ -136,19 +136,20 @@ $(RUSTCSRC): rust-nightly-date
.PHONY: rust_tests
RUST_TESTS_DIR := $(RUSTCSRC)src/test/
-rust_tests: rust_tests-run-pass rust_tests-run-fail rust_tests-compile-fail
+rust_tests: rust_tests-run-pass rust_tests-run-fail
+# rust_tests-compile-fail
DEF_RUST_TESTS = $(sort $(patsubst $(RUST_TESTS_DIR)%.rs,output/rust/%.o,$(wildcard $(RUST_TESTS_DIR)$1/*.rs)))
rust_tests-run-pass: $(call DEF_RUST_TESTS,run-pass)
rust_tests-run-fail: $(call DEF_RUST_TESTS,run-fail)
-rust_tests-compile-fail: $(call DEF_RUST_TESTS,compile-fail)
+#rust_tests-compile-fail: $(call DEF_RUST_TESTS,compile-fail)
output/rust/test_run-pass_hello: $(RUST_TESTS_DIR)run-pass/hello.rs output/libstd.hir $(BIN)
$(DBG) $(BIN) $< -o $@ $(PIPECMD)
output/rust/%.o: $(RUST_TESTS_DIR)%.rs $(RUSTCSRC) $(BIN)
@mkdir -p $(dir $@)
- $(BIN) $< -o $@ --stop-after parse > $@.txt 2>&1
+ $(BIN) $< -o $@ --stop-after resolve > $@.txt 2>&1
touch $@
.PHONY: test test_rustos