--- a/components/bash/Makefile	Tue Feb 17 13:07:15 2015 -0800
+++ b/components/bash/Makefile	Tue Feb 17 18:43:54 2015 -0800
@@ -72,9 +72,22 @@
 # -z redlocsym -- let's shrink the SHT_SYMTAB as much as we can
 LDFLAGS =	$(LD_Z_REDLOCSYM)
 
+# Do not change the order of these regexp transforms.
+COMPONENT_TEST_TRANSFORMS += \
+     '-e "/^</d"' \
+     '-e "/^>/d"' \
+     '-e "/^---/d"' \
+     '-e "s/^[0-9]\{1,\}[a-z]\{1,\}[0-9]\{1,\}//g"' \
+     '-e "s/^[0-9]\{1,\},[0-9]\{1,\}[a-z]\{1,\}[0-9]\{1,\},[0-9]\{1,\}//g"' \
+     '-e "/^$$/d"' \
+     '-e "s/i386-pc-//g"' \
+     '-e "s/i386//g"' \
+     '-e "s/sparc-sun-//g"' \
+     '-e "s/sparc//g"'
+
 # The bash test harness needs the GNU userland utilities
 TEST_PATH = "PATH=$(BUILD_DIR_64):$(GNUBIN):$(USRBINDIR)"
-TEST_OUTPUT = $(COMPONENT_DIR)/bash_test_results_$(MACH).out
+TEST_RESULTS_FILE = $(COMPONENT_TEST_RESULTS_DIR)/test-$(BITS)-results
 
 CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_ENV +=	LDFLAGS="$(LDFLAGS)"
@@ -125,7 +138,7 @@
 
 COMPONENT_TEST_DIR =		$(BUILD_DIR_64)
 COMPONENT_TEST_ENV =		- $(TEST_PATH)
-COMPONENT_TEST_TARGETS =	check > $(TEST_OUTPUT) 2>&1
+COMPONENT_TEST_TARGETS =	check > $(TEST_RESULTS_FILE) 2>&1
 
 ASLR_MODE=$(ASLR_ENABLE)
 
@@ -141,6 +154,5 @@
 
 test:	$(TEST_64)
 
-
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library