diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-04-04 17:57:36 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-04-04 18:08:55 -0700 |
| commit | 4baf2ceae1475933e9e871c8c56a7e8039c61bbc (patch) | |
| tree | cde85a0cd6cbd0719174fd94f3d6a69eb301300e | |
| parent | 74b0f5dcc7b5038c5603bc47d77f7df6f9766f08 (diff) | |
| download | rust-4baf2ceae1475933e9e871c8c56a7e8039c61bbc.tar.gz rust-4baf2ceae1475933e9e871c8c56a7e8039c61bbc.zip | |
Clean up artifacts in test subdir. Should close #2066.
| -rw-r--r-- | mk/clean.mk | 31 | ||||
| -rw-r--r-- | mk/tests.mk | 32 |
2 files changed, 34 insertions, 29 deletions
diff --git a/mk/clean.mk b/mk/clean.mk index 61dcfe4465b..53eb01ad3d8 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -23,31 +23,21 @@ clean: clean-misc $(CLEAN_STAGE_RULES) clean-misc: @$(call E, cleaning) + $(Q)find rustllvm rt $(CFG_HOST_TRIPLE)/test \ + -name '*.[odasS]' -o \ + -name '*.so' -o \ + -name '*.dylib' -o \ + -name '*.dll' -o \ + -name '*.def' -o \ + -name '*.bc' -o \ + -name '*.dSYM' \ + | xargs rm -f $(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF) $(Q)rm -f $(RUSTLLVM_LIB_OBJS) $(RUSTLLVM_OBJS_OBJS) $(RUSTLLVM_DEF) - $(Q)rm -f $(ML_DEPFILES) $(C_DEPFILES) $(CRATE_DEPFILES) - $(Q)rm -f $(ML_DEPFILES:%.d=%.d.tmp) - $(Q)rm -f $(C_DEPFILES:%.d=%.d.tmp) - $(Q)rm -f $(CRATE_DEPFILES:%.d=%.d.tmp) $(Q)rm -Rf $(DOCS) $(Q)rm -Rf $(GENERATED) - $(Q)rm -f tmp/*.log - $(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a - $(Q)rm -f rt/$(CFG_RUNTIME) - $(Q)find rustllvm rt -name '*.[odasS]' -delete - $(Q)find rustllvm rt -name '*.so' -delete - $(Q)find rustllvm rt -name '*.dylib' -delete - $(Q)find rustllvm rt -name '*.dll' -delete - $(Q)find rustllvm rt -name '*.def' -delete - $(Q)rm -Rf $(wildcard rt/*/libuv/Default) - $(Q)rm -f test/run_pass_stage2.rc test/run_pass_stage2_driver.rs + $(Q)rm -f tmp/*.log tmp/*.rc tmp/*.rs $(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist - $(Q)rm -Rf $(foreach ext,out out.tmp \ - stage0$(X) stage1$(X) stage2$(X) \ - bc o s so dll exe dSYM, \ - $(wildcard test/*.$(ext) \ - test/*/*.$(ext) \ - test/bench/*/*.$(ext))) $(Q)rm -Rf $(foreach ext, \ html aux cp fn ky log pdf pg toc tp vr cps, \ $(wildcard doc/*.$(ext) \ @@ -57,7 +47,6 @@ clean-misc: $(Q)rm -Rf doc/version.md $(Q)rm -Rf $(foreach sub, index styles files search javascript, \ $(wildcard doc/*/$(sub))) - $(Q)rm -rf libuv define CLEAN_HOST_STAGE_N diff --git a/mk/tests.mk b/mk/tests.mk index 7b503b2109a..e4053b8c4bd 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -66,16 +66,32 @@ endif # Main test targets ###################################################################### +.PHONY: cleantmptestlogs cleantestlibs + cleantmptestlogs: $(Q)rm -f tmp/*.log -check: cleantmptestlogs tidy all check-stage2 +cleantestlibs: + $(Q)find $(CFG_HOST_TRIPLE)/test \ + -name '*.[odasS]' -o \ + -name '*.so' -o \ + -name '*.dylib' -o \ + -name '*.dll' -o \ + -name '*.def' -o \ + -name '*.bc' -o \ + -name '*.dSYM' -o \ + -name '*.out' -o \ + -name '*.err' \ + | xargs rm -f + +check: cleantestlibs cleantmptestlogs tidy all check-stage2 $(Q)$(S)src/etc/check-summary.py tmp/*.log -check-full: cleantmptestlogs tidy all check-stage1 check-stage2 check-stage3 +check-full: cleantestlibs cleantmptestlogs tidy \ + all check-stage1 check-stage2 check-stage3 $(Q)$(S)src/etc/check-summary.py tmp/*.log -check-test: cleantmptestlogs all check-stage2-rfail +check-test: cleantestlibs cleantmptestlogs all check-stage2-rfail $(Q)$(S)src/etc/check-summary.py tmp/*.log # Run the tidy script in multiple parts to avoid huge 'echo' commands @@ -166,16 +182,16 @@ define TEST_STAGEN check-stage$(1)-T-$(2)-H-$(3): tidy \ check-stage$(1)-T-$(2)-H-$(3)-rustc \ - check-stage$(1)-T-$(2)-H-$(3)-core \ + check-stage$(1)-T-$(2)-H-$(3)-core \ check-stage$(1)-T-$(2)-H-$(3)-std \ check-stage$(1)-T-$(2)-H-$(3)-rpass \ check-stage$(1)-T-$(2)-H-$(3)-rfail \ check-stage$(1)-T-$(2)-H-$(3)-cfail \ check-stage$(1)-T-$(2)-H-$(3)-bench \ - check-stage$(1)-T-$(2)-H-$(3)-pretty \ - check-stage$(1)-T-$(2)-H-$(3)-rustdoc \ - check-stage$(1)-T-$(2)-H-$(3)-doc-tutorial \ - check-stage$(1)-T-$(2)-H-$(3)-doc-ref + check-stage$(1)-T-$(2)-H-$(3)-pretty \ + check-stage$(1)-T-$(2)-H-$(3)-rustdoc \ + check-stage$(1)-T-$(2)-H-$(3)-doc-tutorial \ + check-stage$(1)-T-$(2)-H-$(3)-doc-ref check-stage$(1)-T-$(2)-H-$(3)-core: \ check-stage$(1)-T-$(2)-H-$(3)-core-dummy |