---

yaml
---
r: 1293
b: refs/heads/master
c: 5b3e7e5
h: refs/heads/master
i:
  1291: a0ccfec
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b82060c5e40e0b4e996bcd30deccd2a523c7590
+refs/heads/master: 5b3e7e599d5fa90a2da72228c68910e21f90e5cb

trunk/src/Makefile

@@ -681,25 +681,24 @@ test/run-fail/%.out.tmp: test/run-fail/%$(CFG_EXE_SUFFIX) \
 	$(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 }' \
-        test/run-fail/$(basename $*).rs \
-        | tr -d '\n\r'`" $@
+      "$$(grep error-pattern test/run-fail/$(basename $*).rs \
+        | cut -d : -f 2- | tr -d '\n\r')" $@
 
 test/compile-fail/%.boot.out.tmp: test/compile-fail/%.rs $(BREQ)
 	@$(call CFG_ECHO, compile [boot]: $<)
 	$(CFG_QUIET)grep -q error-pattern $<
 	$(CFG_QUIET)rm -f $@
 	$(BOOT) -o $(@:.out=$(CFG_EXE_SUFFIX)) $< >$@ 2>&1; test $$? -ne 0
 	$(CFG_QUIET)grep --text --quiet \
-      "`awk -F: '/error-pattern/ { print $$2 }' $< | tr -d '\n\r'`" $@
+      "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@
 
 test/compile-fail/%.rustc.out.tmp: test/compile-fail/%.rs $(SREQ)
 	@$(call CFG_ECHO, compile [rustc]: $<)
 	$(CFG_QUIET)grep -q error-pattern $<
 	$(CFG_QUIET)rm -f $@
 	$(RUSTC) -o $(@:.out=$(CFG_EXE_SUFFIX)) $< >$@ 2>&1; test $$? -ne 0
 	$(CFG_QUIET)grep --text --quiet \
-      "`awk -F: '/error-pattern/ { print $$2 }' $< | tr -d '\n\r'`" $@
+      "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@
 
 test/run-pass/%.boot$(CFG_EXE_SUFFIX): test/run-pass/%.rc $(BREQ)
 	@$(call CFG_ECHO, compile [boot]: $<)