---

yaml
---
r: 3860
b: refs/heads/master
c: 9a37308
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f06fdd5ca16abba5c4c0dc7d94a25589942593ee
+refs/heads/master: 9a37308101bb188794eebdcd377c30ba39a3c082

trunk/mk/tests.mk

@@ -138,7 +138,6 @@ ALL_TEST_SOURCES := $(TEST_CFAIL_SOURCES_STAGE0) \
                     $(TEST_RFAIL_SOURCES_STAGE2) \
                     $(TEST_RPASS_SOURCES_STAGE2)
 
-
 FT := run_pass_stage2
 FT_LIB := $(call CFG_LIB_NAME,$(FT))
 FT_DRIVER := $(FT)_driver
@@ -338,9 +337,31 @@ test/compile-fail/%.stage2.out.tmp: test/compile-fail/%.rc $(SREQ2)
 	$(Q)grep --text --quiet \
       "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@
 
+# Testing the stdtest crate
+
 STDTEST_CRATE := $(S)src/test/stdtest/stdtest.rc
 STDTEST_INPUTS := $(wildcard $(S)src/test/stdtest/*rs)
 
 test/stdtest/stdtest.stage1$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ1)
 	@$(call E, compile_and_link: $@)
 	$(STAGE1) -o $@ $< --test
+
+test/stdtest/stdtest.stage2$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ2)
+	@$(call E, compile_and_link: $@)
+	$(STAGE2) -o $@ $< --test
+
+test/stdtest/stdtest.stage3$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ3)
+	@$(call E, compile_and_link: $@)
+	$(STAGE3) -o $@ $< --test
+
+check-stage1-std:test/stdtest/stdtest.stage1$(X)
+	@$(call E, run: $<)
+	$(Q)$(call CFG_RUN_TARG,stage1,stage1, $<)
+
+check-stage2-std:test/stdtest/stdtest.stage2$(X)
+	@$(call E, run: $<)
+	$(Q)$(call CFG_RUN_TARG,stage2,stage2, $<)
+
+check-stage3-std:test/stdtest/stdtest.stage3$(X)
+	@$(call E, run: $<)
+	$(Q)$(call CFG_RUN_TARG,stage3,stage3, $<)