---

yaml
---
r: 1879
b: refs/heads/master
c: b628c35
h: refs/heads/master
i:
  1877: 8042f97
  1875: 36b826b
  1871: 636900e
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bea41aa7d8ef0d47b973fada981723cefc37d490
+refs/heads/master: b628c352f36b62c22014e0e9383090cfbae2e50c

trunk/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