---

yaml
---
r: 843
b: refs/heads/master
c: cb254f3
h: refs/heads/master
i:
  841: 1aaa7da
  839: 190cd3b
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05a3c5c0f3967f676778f477c7f823af6bec6c2f
+refs/heads/master: cb254f35589c11d27fb95fbbe64b4272ef3954b8

trunk/src/Makefile

@@ -500,7 +500,6 @@ TEST_XFAILS_SELF := $(filter-out \
                       $(addprefix test/run-pass/, \
                         bool-not.rs \
                         char.rs \
-                        div-mod.rs \
                         hello.rs \
                         int.rs \
                         item-name-overload.rs \
@@ -704,15 +703,16 @@ test/run-pass/%.out.tmp: test/run-pass/%$(CFG_EXE_SUFFIX) $(CFG_RUNTIME)
 	@$(call CFG_ECHO, run: $<)
 	$(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@
 
-test/run-fail/%-boot.out.tmp: test/run-fail/%$(CFG_EXE_SUFFIX) $(CFG_RUNTIME)
+test/run-fail/%-boot.x86.out.tmp: test/run-fail/%-boot.x86$(CFG_EXE_SUFFIX) \
+                                  $(CFG_RUNTIME)
 	$(CFG_QUIET)rm -f $<.tmp
 	@$(call CFG_ECHO, run: $<)
 	$(CFG_QUIET)rm -f $@
 	$(CFG_QUIET)$(call CFG_RUN_TARG, $<) >$@ 2>&1 ; X=$$? ; \
       if [ $$X -eq 0 ] ; then exit 1 ; else exit 0 ; fi
 	$(CFG_QUIET)grep --text --quiet \
       "`awk -F: '/error-pattern/ { print $$2 }' \
-        $(basename $(basename $(basename $@ -boot.out.tmp))).rs \
+        $(subst -boot.x86.out.tmp,.rs,$@) \
         | tr -d '\n\r'`" $@
 
 test/compile-fail/%-boot.x86.out.tmp: test/compile-fail/%.rs $(BREQ)