diff options
| author | Rafael Ávila de Espíndola <respindola@mozilla.com> | 2011-01-26 11:24:49 -0500 |
|---|---|---|
| committer | Rafael Ávila de Espíndola <respindola@mozilla.com> | 2011-01-26 11:24:49 -0500 |
| commit | 5b3e7e599d5fa90a2da72228c68910e21f90e5cb (patch) | |
| tree | caf9144b8fe01d3305a289135f4fa7a7fade1269 | |
| parent | 1b82060c5e40e0b4e996bcd30deccd2a523c7590 (diff) | |
| download | rust-5b3e7e599d5fa90a2da72228c68910e21f90e5cb.tar.gz rust-5b3e7e599d5fa90a2da72228c68910e21f90e5cb.zip | |
Fix issue 207 by considering everything after the first : in the error-pattern
line.
| -rw-r--r-- | src/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 8ad5c4bccf9..2aa5bbc764b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -681,9 +681,8 @@ 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]: $<) @@ -691,7 +690,7 @@ test/compile-fail/%.boot.out.tmp: test/compile-fail/%.rs $(BREQ) $(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]: $<) @@ -699,7 +698,7 @@ test/compile-fail/%.rustc.out.tmp: test/compile-fail/%.rs $(SREQ) $(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]: $<) |