Replace most call to grep in run-make by a script that cat the input.#46207
Replace most call to grep in run-make by a script that cat the input.#46207bors merged 2 commits intorust-lang:masterfrom
Conversation
|
(rust_highfive has picked a reviewer for you, use r? to override) |
kennytm
added
the
S-waiting-on-review
|
☔ The latest upstream changes (presumably #45946) made this pull request unmergeable. Please resolve the merge conflicts. |
|
☔ The latest upstream changes (presumably #46008) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Nice! My only hesitation is that this script is probably pretty likely to grow a lot over time and receive and endless stream of "be compatible with python 2 and python 3" PRs along with "pep8 style" PRs. I wonder if we could reduce the maintenance burden on ourselves somewhat with a shell pipeline using |
|
@alexcrichton Done (now hope that there isn't an endless stream of "be compatible with /bin/sh" 😆). |
|
@bors: r+ Heh, well we always seem to get an endless stream of something, no? Thanks! |
|
📌 Commit b18134a has been approved by |
kennytm
added
S-waiting-on-bors
|
Since this PR is in the 3rd place of the actual queue, let me test using the PR CI instead. Edit: Well, just no output from the sanitizer test 🤷. https://travis-ci.org/rust-lang/rust/jobs/307521898#L6024 |
kennytm
added
S-waiting-on-author
kennytm
added
S-waiting-on-bors
|
@bors r=alexcrichton |
|
📌 Commit d8701a7 has been approved by |
|
⌛ Testing commit d8701a73df86cdf4bb77a6623f068f0492ba4cac with merge f7b27b10694b71739b4c2c3bd0aba373fdcf5f3e... |
|
💔 Test failed - status-appveyor |
|
@bors r=alexcrichton |
|
📌 Commit 2ed7cce has been approved by |
|
⌛ Testing commit 2ed7cce7ddd3bf0f10f850ea19d2709ca3811a03 with merge 2a7a34495a1c483b8b526b0536c7693adc27b8e9... |
|
💔 Test failed - status-travis |
|
@bors retry Looks like spurious. Good thing is we've got the output (mmap error?). |
|
⌛ Testing commit 2ed7cce7ddd3bf0f10f850ea19d2709ca3811a03 with merge 03253592babb2bbd39de96121f4a6983988937d5... |
|
💔 Test failed - status-appveyor |
|
The error is legit... which is because the DetailsWe can clearly see the diff --git a/src/test/run-make/cdylib-fewer-symbols/Makefile b/src/test/run-make/cdylib-fewer-symbols/Makefile
index 954ee792460a..929d5571194b 100644
--- a/src/test/run-make/cdylib-fewer-symbols/Makefile
+++ b/src/test/run-make/cdylib-fewer-symbols/Makefile
@@ -9,9 +9,5 @@ all:
else
all:
$(RUSTC) foo.rs
- nm -g "$(call DYLIB,foo)"
- nm -g "$(call DYLIB,foo)" | grep -vq __rdl_
- nm -g "$(call DYLIB,foo)" | grep -vq __rde_
- nm -g "$(call DYLIB,foo)" | grep -vq __rg_
- nm -g "$(call DYLIB,foo)" | grep -vq __rust_
+ nm -g "$(call DYLIB,foo)" | $(CGREP) -v __rdl_ __rde_ __rg_ __rust_The problem is that cc #45710 @alexcrichton — I'm going to disable the test for all Windows (it is already disabled for MSVC), is this okay? |
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 rust-lang#45810, as well as real errors such as rust-lang#46126.
|
Gah sorry about that! Yes feel free to disable and I will investigate when I can |
|
@bors r=alexcrichton |
|
📌 Commit 918158d has been approved by |
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 spurious error in #45810, as well as real errors such as #46126. (cc #40713) Some `grep` still remains, mainly the `grep -c` calls that count the number of matches and print the result to stdout.
|
☀️ Test successful - status-appveyor, status-travis |
4 participants
Introduced a new
src/etc/cat-and-grep.shscript (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 spurious error in #45810, as well as real errors such as #46126.(cc #40713)
Some
grepstill remains, mainly thegrep -ccalls that count the number of matches and print the result to stdout.