bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #15988 : brson/rust/antlrprep, r=cmr

Browse source 
Add `check-secondary`, which runs the pretty and lexer tests so we can run them on a dedicated bot. Leaves the pretty tests running under `check` until the bots are switched over. Also fixes some issues.

r? @cmr
This commit is contained in:
bors 2014-07-26 10:31:23 +00:00
commit 0d53597ce2
2 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
mk/grammar.mk
View file

@ -13,7 +13,7 @@ SG = $(S)src/grammar/
B = $(CFG_BUILD_DIR)/$(CFG_BUILD)/stage2/ B = $(CFG_BUILD_DIR)/$(CFG_BUILD)/stage2/
L = $(B)lib/rustlib/$(CFG_BUILD)/lib L = $(B)lib/rustlib/$(CFG_BUILD)/lib
LD = $(CFG_BUILD)/stage2/lib/rustlib/$(CFG_BUILD)/lib/ LD = $(CFG_BUILD)/stage2/lib/rustlib/$(CFG_BUILD)/lib/
RUSTC = $(B)bin/rustc RUSTC = $(STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD))
# Run the reference lexer against libsyntax and compare the tokens and spans. # Run the reference lexer against libsyntax and compare the tokens and spans.
# If "// ignore-lexer-test" is present in the file, it will be ignored. # If "// ignore-lexer-test" is present in the file, it will be ignored.
@ -37,19 +37,25 @@ $(BG)RustLexer.class: $(SG)RustLexer.g4
$(BG)verify: $(SG)verify.rs rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.regex_macros $(LD)stamp.rustc $(BG)verify: $(SG)verify.rs rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.regex_macros $(LD)stamp.rustc
$(Q)$(RUSTC) -O --out-dir $(BG) -L $(L) $(SG)verify.rs $(Q)$(RUSTC) -O --out-dir $(BG) -L $(L) $(SG)verify.rs
check-lexer: $(BG) $(BG)RustLexer.class $(BG)verify
ifdef CFG_JAVAC ifdef CFG_JAVAC
ifdef CFG_ANTLR4 ifdef CFG_ANTLR4
ifdef CFG_GRUN ifdef CFG_GRUN
check-lexer: $(BG) $(BG)RustLexer.class $(BG)verify
$(info Verifying libsyntax against the reference lexer ...) $(info Verifying libsyntax against the reference lexer ...)
$(Q)$(SG)check.sh $(S) "$(BG)" \ $(Q)$(SG)check.sh $(S) "$(BG)" \
"$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens" "$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens"
else else
$(info grun not available, skipping lexer test...) $(info cfg: grun not available, skipping lexer test...)
check-lexer:
endif endif
else else
$(info antlr4 not available, skipping lexer test...) $(info cfg: antlr4 not available, skipping lexer test...)
check-lexer:
endif endif
else else
$(info javac not available, skipping lexer test...) $(info cfg: javac not available, skipping lexer test...)
check-lexer:
endif endif

15
mk/tests.mk
View file

@ -171,28 +171,41 @@ endif
# Main test targets # Main test targets
###################################################################### ######################################################################
# The main testing target. Tests lots of stuff.
check: cleantmptestlogs cleantestlibs check-notidy tidy check: cleantmptestlogs cleantestlibs check-notidy tidy
# As above but don't bother running tidy.
check-notidy: cleantmptestlogs cleantestlibs all check-stage2 check-notidy: cleantmptestlogs cleantestlibs all check-stage2
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log $(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
# A slightly smaller set of tests for smoke testing.
check-lite: cleantestlibs cleantmptestlogs \ check-lite: cleantestlibs cleantmptestlogs \
$(foreach crate,$(TEST_TARGET_CRATES),check-stage2-$(crate)) \ $(foreach crate,$(TEST_TARGET_CRATES),check-stage2-$(crate)) \
check-stage2-rpass \ check-stage2-rpass \
check-stage2-rfail check-stage2-cfail check-stage2-rmake check-stage2-rfail check-stage2-cfail check-stage2-rmake
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log $(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
# Only check the 'reference' tests: rpass/cfail/rfail/rmake.
check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \ check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \
check-stage2-rfail check-stage2-cfail check-stage2-rmake check-stage2-rfail check-stage2-cfail check-stage2-rmake
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log $(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
# Only check the docs.
check-docs: cleantestlibs cleantmptestlogs check-stage2-docs check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log $(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
# NOTE: Remove after reprogramming windows bots # NOTE: Remove after reprogramming windows bots
check-fast: check-lite check-fast: check-lite
check-syntax: check-lexer # Some less critical tests that are not prone to breakage.
# Not run as part of the normal test suite, but tested by bors on checkin.
check-secondary: check-lexer check-pretty
# check + check-secondary.
check-all: check check-secondary
# Pretty-printing tests.
check-pretty: check-stage2-T-$(CFG_BUILD)-H-$(CFG_BUILD)-pretty-exec
.PHONY: cleantmptestlogs cleantestlibs .PHONY: cleantmptestlogs cleantestlibs