summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-12-29 17:15:42 +1100
committerJohn Hodge <tpg@mutabah.net>2016-12-29 17:15:42 +1100
commitf3b893fc043f0217517606f701a9d82efade62d0 (patch)
treef56ae3497999d35c4c1b09c47cb3b9eaaf51d6aa
parent27985de4e5c26a53fa330dcb8ed8dc6342681d31 (diff)
downloadmrust-f3b893fc043f0217517606f701a9d82efade62d0.tar.gz
Makefile - Generate full code for rust tests
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ba78b6e4..bea2581b 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ TAIL_COUNT ?= 45
# - Final stage for tests run as part of the rust_tests target.
# VALID OPTIONS: parse, expand, mir, ALL
-RUST_TESTS_FINAL_STAGE ?= mir
+RUST_TESTS_FINAL_STAGE ?= ALL
LINKFLAGS := -g
LIBS := -lz
@@ -229,8 +229,8 @@ TEST_ARGS_run-pass/cfgs-on-items := --cfg fooA --cfg fooB
output/rust/%.o: $(RUST_TESTS_DIR)%.rs $(RUSTCSRC) $(BIN) output/libstd.hir output/libtest.hir
@mkdir -p $(dir $@)
@echo "--- TEST $(patsubst output/rust/%.o,%,$@)"
- @$(BIN) $< -o $@ --stop-after $(RUST_TESTS_FINAL_STAGE) $(TEST_ARGS_$*) > $@.txt 2>&1 || tail -n 1 $@.txt
- @touch $@
+ @$(BIN) $< -o $@.c --stop-after $(RUST_TESTS_FINAL_STAGE) $(TEST_ARGS_$*) > $@.txt 2>&1 || (tail -n 1 $@.txt; false)
+ @$(CC) $@.c -pthread -g -o $@
output/rust/run-pass/allocator-default.o: output/libstd.hir output/liballoc_jemalloc.hir
output/rust/run-pass/allocator-system.o: output/liballoc_system.hir