diff options
author | John Hodge <tpg@ucc.asn.au> | 2018-02-21 18:22:50 +0800 |
---|---|---|
committer | John Hodge <tpg@ucc.asn.au> | 2018-02-21 18:22:50 +0800 |
commit | 96fa368184bfcf84bf157a756396791eafc050fe (patch) | |
tree | 5b056cf6af28f6b2e50ee1dd1294e57bf700a540 | |
parent | 277c6721480be163d8e7e4944acfe9c7c1d5278f (diff) | |
download | mrust-96fa368184bfcf84bf157a756396791eafc050fe.tar.gz |
Move local tests to use the test runner
-rw-r--r-- | Makefile | 11 | ||||
-rw-r--r-- | samples/test/for_underscore_drop.rs | 1 | ||||
-rw-r--r-- | samples/test/scoping_rules.rs | 1 |
3 files changed, 6 insertions, 7 deletions
@@ -202,13 +202,10 @@ endif # MRUSTC-specific tests .PHONY: local_tests -local_tests: $(patsubst samples/test/%.rs,output/local_test/%_out.txt,$(wildcard samples/test/*.rs)) - -output/local_test/%_out.txt: output/local_test/% - ./$< > $@ -output/local_test/%: samples/test/%.rs $(TEST_DEPS) - mkdir -p $(dir $@) - $(BIN) -g $< -o $@ $(RUST_FLAGS) --test $(PIPECMD) +local_tests: + @$(MAKE) -C tools/testrunner + @mkdir -p output/local_tests + ./tools/bin/testrunner -o output/local_tests samples/test # # RUSTC TESTS diff --git a/samples/test/for_underscore_drop.rs b/samples/test/for_underscore_drop.rs index e590fee0..b6ed46d0 100644 --- a/samples/test/for_underscore_drop.rs +++ b/samples/test/for_underscore_drop.rs @@ -1,3 +1,4 @@ +// compile-flags: --test struct DropFlag<'a>(&'a mut i32); impl<'a> ::std::ops::Drop for DropFlag<'a> diff --git a/samples/test/scoping_rules.rs b/samples/test/scoping_rules.rs index 9878fd16..573fff21 100644 --- a/samples/test/scoping_rules.rs +++ b/samples/test/scoping_rules.rs @@ -1,3 +1,4 @@ +// compile-flags: --test struct DropFlag<'a>(&'a ::std::cell::Cell<i32>); impl<'a> ::std::ops::Drop for DropFlag<'a> |