about summary refs log tree commit diff
path: root/src/test/run-make/error-found-staticlib-instead-crate
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2017-11-23 23:19:50 +0800
committerkennytm <kennytm@gmail.com>2017-11-28 23:36:12 +0800
commitab788a2ee175c7560f0ca58bbc183ecfd57d2f7a (patch)
treed2ed1e61f108296e0cafaf65f1f8d083983dfae6 /src/test/run-make/error-found-staticlib-instead-crate
parent3bde5e78aef6c05a23f6068403682df7517d5a73 (diff)
downloadrust-ab788a2ee175c7560f0ca58bbc183ecfd57d2f7a.tar.gz
rust-ab788a2ee175c7560f0ca58bbc183ecfd57d2f7a.zip
Replace most call to grep in run-make by a script that cat the input.
Introduced a new src/etc/cat-and-grep.sh script (called in run-make as
$(CGREP)), which prints the input and do a grep simultaneously. This is
mainly used to debug spurious failures in run-make, such as the sanitizer
error in #45810, as well as real errors such as #46126.
Diffstat (limited to 'src/test/run-make/error-found-staticlib-instead-crate')
-rw-r--r--src/test/run-make/error-found-staticlib-instead-crate/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/run-make/error-found-staticlib-instead-crate/Makefile b/src/test/run-make/error-found-staticlib-instead-crate/Makefile
index 24ff20ea892..fef12c4da67 100644
--- a/src/test/run-make/error-found-staticlib-instead-crate/Makefile
+++ b/src/test/run-make/error-found-staticlib-instead-crate/Makefile
@@ -2,4 +2,4 @@
 
 all:
 	$(RUSTC) foo.rs --crate-type staticlib
-	$(RUSTC) bar.rs 2>&1 | grep "found staticlib"
+	$(RUSTC) bar.rs 2>&1 | $(CGREP) "found staticlib"