From 21bb60afc1d20399ceed73dcb7939432e05b5688 Mon Sep 17 00:00:00 2001 From: Yorwba Date: Thu, 29 Jun 2017 20:07:51 +0800 Subject: [PATCH] Replace `grep -z` by `tr -d '\r\n' | grep` for cross-compatibility --- src/test/run-make/type-mismatch-same-crate-name/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/run-make/type-mismatch-same-crate-name/Makefile b/src/test/run-make/type-mismatch-same-crate-name/Makefile index 24ef203278a7..1044d73fd1a3 100644 --- a/src/test/run-make/type-mismatch-same-crate-name/Makefile +++ b/src/test/run-make/type-mismatch-same-crate-name/Makefile @@ -8,7 +8,7 @@ all: $(RUSTC) --crate-type=rlib crateB.rs --extern crateA=$(TMPDIR)/libcrateA-1.rlib # make crateC depend on version 2 of crateA $(RUSTC) crateC.rs --extern crateA=$(TMPDIR)/libcrateA-2.rlib 2>&1 | \ - grep -z \ + tr -d '\r\n' | grep \ "mismatched types.*\ crateB::try_foo(foo2);.*\ expected struct \`crateA::foo::Foo\`, found struct \`crateA::Foo\`.*\