diff options
| author | Graydon Hoare <[email protected]> | 2011-03-26 17:35:26 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2011-03-26 17:35:26 -0700 |
| commit | b628c352f36b62c22014e0e9383090cfbae2e50c (patch) | |
| tree | 636f3326d2b1e3c1f525704902b6c61f6a4bdd6b | |
| parent | rustc: Add a function to look up external item info in the item info table (diff) | |
| download | rust-b628c352f36b62c22014e0e9383090cfbae2e50c.tar.xz rust-b628c352f36b62c22014e0e9383090cfbae2e50c.zip | |
Fix Makefile.in grep for use on weaker greps (win32 mingw).
| -rw-r--r-- | Makefile.in | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index 1cb84047..98c110cd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -568,17 +568,12 @@ docsnap: doc/rust.pdf # Testing variables ###################################################################### -TEST_XFAILS_BOOT = $(shell grep \ - --recursive \ - --files-with-matches \ - --include=*.rs --include=*.rc \ - xfail-boot $(S)src/test) - -TEST_XFAILS_STAGE0 = $(shell grep \ - --recursive \ - --files-with-matches \ - --include=*.rs --include=*.rc \ - xfail-stage0 $(S)src/test) +ALL_TEST_INPUTS = $(wildcard $(S)src/test/*/*.rs \ + $(S)src/test/*/*/*.rs \ + $(S)src/test/*/*.rc) + +TEST_XFAILS_BOOT = $(shell grep -l xfail-boot $(ALL_TEST_INPUTS)) +TEST_XFAILS_STAGE0 = $(shell grep -l xfail-stage0 $(ALL_TEST_INPUTS)) ifdef MINGW_CROSS TEST_XFAILS_BOOT += $(S)src/test/run-pass/native-mod.rc @@ -688,10 +683,6 @@ ALL_TEST_SOURCES = $(TEST_CFAIL_SOURCES_BOOT) \ $(TEST_RFAIL_SOURCES_STAGE0) \ $(TEST_RPASS_SOURCES_STAGE0) -ALL_TEST_INPUTS = $(wildcard $(S)src/test/*/*.rs \ - $(S)src/test/*/*/*.rs \ - $(S)src/test/*/*.rc) - # The test suite currently relies on logging to validate results so # make sure that logging uses the default configuration unexport RUST_LOG |