summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2017-05-14 12:37:48 +0800
committerJohn Hodge <tpg@ucc.asn.au>2017-05-14 12:37:48 +0800
commit699dbed9dca998b0df8418fde68235d230a726eb (patch)
tree35c266305d80de33c8ce5a027c37393de0a5fabc
parentf997bde2fa83506ea66768a8e2dd8080b6a0547a (diff)
downloadmrust-699dbed9dca998b0df8418fde68235d230a726eb.tar.gz
Makefile - Fix test rules (for travis-ci)
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c7b425cb..177d1978 100644
--- a/Makefile
+++ b/Makefile
@@ -340,7 +340,7 @@ local_tests: $(patsubst samples/test/%.rs,output/local_test/%_out.txt,$(wildcard
output/local_test/%_out.txt: output/local_test/%
./$< > $@
-output/local_test/%: samples/test/%.rs $(BIN)
+output/local_test/%: samples/test/%.rs $(BIN) output/libtest.hir output/libpanic_abort.hir output/liballoc_system.hir
mkdir -p $(dir $@)
$(BIN) -L output/libs -g $< -o $@ --test $(PIPECMD)
@@ -828,8 +828,10 @@ output/%_out.txt: output/%
@./$< $(RUNTIME_ARGS_$<) > $@ || (tail -n 1 $@; mv $@ $@_fail; false)
output/test_deps/librust_test_helpers.a: output/test_deps/rust_test_helpers.o
+ @mkdir -p $(dir $@)
ar cur $@ $<
output/test_deps/rust_test_helpers.o: $(RUSTCSRC)src/rt/rust_test_helpers.c
+ @mkdir -p $(dir $@)
$(CC) -c $< -o $@
output/rust/run-pass/allocator-default.o: output/libstd.hir output/liballoc_jemalloc.hir