summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-11-26 10:52:08 +0800
committerJohn Hodge <tpg@mutabah.net>2016-11-26 10:52:08 +0800
commitd0be7c28cdf2068a89f0d33c97d0e5500f2c7dc9 (patch)
treed2de1d7b0f22196c61878c7c9f93b9095c8f58ef
parent3db52a81d3891ff7030d622fd2f364cafa29c278 (diff)
downloadmrust-d0be7c28cdf2068a89f0d33c97d0e5500f2c7dc9.tar.gz
Travis - Reduce log size, add libsyntax_ext
-rw-r--r--.travis.yml10
-rw-r--r--Makefile4
2 files changed, 6 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 9919ed7b..0f7d4819 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,14 +12,10 @@ addons:
install:
# Build mrustc
- - CC=gcc-6 && CXX=g++-6 make
-# # Build libstd (and hello world). Also downloads the source
-# - make test
-# # Create the test dependencies testlibstd (and hello world). Also downloads the source
-# - make test_deps_run-pass.mk
+ - CC=gcc-6 CXX=g++-6 make
# Tests! (check that they parse, and keep going)
script:
- - make test
- - make output/librustc_typeck.hir output/librustc_mir.hir output/librustc_trans.hir
+ - make test TAIL_COUNT=2
+ - make output/librustc_typeck.hir output/librustc_mir.hir output/librustc_trans.hir output/libsyntax_ext.hir TAIL_COUNT=2
# - make rust_tests-run-pass RUST_TESTS_FINAL_STAGE=expand -k
diff --git a/Makefile b/Makefile
index 18af8302..ef2044bd 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,8 @@ EXESUF ?=
CXX ?= g++
V ?= @
+TAIL_COUNT ?= 45
+
.SUFFIXES:
# - Final stage for tests run as part of the rust_tests target.
@@ -105,7 +107,7 @@ clean:
$(RM) -r $(BIN) $(OBJ)
-PIPECMD ?= 2>&1 | tee $@_dbg.txt | tail -n 45 ; test $${PIPESTATUS[0]} -eq 0
+PIPECMD ?= 2>&1 | tee $@_dbg.txt | tail -n $(TAIL_COUNT) ; test $${PIPESTATUS[0]} -eq 0
output/%.ast: samples/%.rs $(BIN)
@mkdir -p output/