--- a/components/ggrep/Makefile	Tue Jun 02 17:50:14 2015 -0700
+++ b/components/ggrep/Makefile	Wed Jun 03 16:57:58 2015 -0700
@@ -58,6 +58,12 @@
 # other than "test." 
 unexport SHELLOPTS
 
+# Test transforms to cut out compile lines
+COMPONENT_TEST_TRANSFORMS += '-e "/^  CC .*/d" ' \
+			     '-e "/^  CCLD .*/d" ' \
+			     '-e "/^  GEN .*/d" ' \
+                             '-e "/^  AR .*/d" '
+
 # common targets
 configure:	$(CONFIGURE_64)
 
@@ -65,8 +71,6 @@
 
 install:	$(INSTALL_64)
 
-# 3 expected failures in gnulib-tests:
-# test-mbrtowc3.sh, test-mbrtowc4.sh, test-mbsrtowcs4.sh
 test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ggrep/patches/gnulib-tests_localename_c.patch	Wed Jun 03 16:57:58 2015 -0700
@@ -0,0 +1,18 @@
+# This patch fixes the core dump and locale issues previously seen in
+# the test-mbrtowc3.sh, test-mbrtowc4.sh and test-mbsrtowcs4.sh tests. 
+# __getlocalename_l is an Oracle private interface. 
+# Do not send this patch upstream.
+
+diff -rup grep-2.20-orig/gnulib-tests/localename.c grep-2.20/gnulib-tests/localename.c
+--- grep-2.20-orig/gnulib-tests/localename.c	2014-01-01 17:36:42.000000000 -0800
++++ grep-2.20/gnulib-tests/localename.c	2015-05-28 14:48:57.639643024 -0700
+@@ -2644,6 +2644,9 @@ gl_locale_name_thread_unsafe (int catego
+             return "";
+           }
+         return querylocale (mask, thread_locale);
++#  elif defined(sun) || defined(__sun) || defined(__sun__)
++        extern char * __getlocalename_l(int, locale_t);
++        return __getlocalename_l (category, thread_locale);
+ #  endif
+       }
+   }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ggrep/test/results-64.master	Wed Jun 03 16:57:58 2015 -0700
@@ -0,0 +1,313 @@
+make[1]: Entering directory `$(@D)'
+Making check in po
+make[2]: Entering directory `$(@D)/po'
+make[2]: Nothing to be done for `check'.
+make[2]: Leaving directory `$(@D)/po'
+Making check in lib
+make[2]: Entering directory `$(@D)/lib'
+/usr/gnu/bin/make  check-am
+make[3]: Entering directory `$(@D)/lib'
+make[3]: Nothing to be done for `check-am'.
+make[3]: Leaving directory `$(@D)/lib'
+make[2]: Leaving directory `$(@D)/lib'
+Making check in doc
+make[2]: Entering directory `$(@D)/doc'
+make[2]: Nothing to be done for `check'.
+make[2]: Leaving directory `$(@D)/doc'
+Making check in src
+make[2]: Entering directory `$(@D)/src'
+make[2]: Nothing to be done for `check'.
+make[2]: Leaving directory `$(@D)/src'
+Making check in tests
+make[2]: Entering directory `$(@D)/tests'
+/usr/gnu/bin/make  get-mb-cur-max
+make[3]: Entering directory `$(@D)/tests'
+make[3]: Leaving directory `$(@D)/tests'
+/usr/gnu/bin/make  check-TESTS
+make[3]: Entering directory `$(@D)/tests'
+make[4]: Entering directory `$(@D)/tests'
+PASS: backref
+backref-multibyte-slow: skipped test: your system has a non-GNU timeout program
+SKIP: backref-multibyte-slow
+PASS: backref-word
+PASS: backslash-s-and-repetition-operators
+PASS: backslash-s-vs-invalid-multitype
+big-hole: skipped test: expensive: disabled by default
+SKIP: big-hole
+big-match: skipped test: expensive: disabled by default
+SKIP: big-match
+PASS: bogus-wctob
+PASS: bre
+PASS: case-fold-backref
+PASS: case-fold-backslash-w
+PASS: case-fold-char-class
+PASS: case-fold-char-range
+PASS: case-fold-char-type
+PASS: case-fold-titlecase
+PASS: char-class-multibyte
+PASS: char-class-multibyte2
+PASS: context-0
+PASS: count-newline
+PASS: dfa-coverage
+PASS: dfa-heap-overrun
+PASS: dfaexec-multibyte
+empty: skipped test: your system has a non-GNU timeout program
+SKIP: empty
+PASS: empty-line
+PASS: epipe
+XFAIL: equiv-classes
+PASS: ere
+PASS: euc-mb
+PASS: fedora
+fgrep-infloop: skipped test: your system has a non-GNU timeout program
+SKIP: fgrep-infloop
+PASS: file
+fmbtest: skipped test: this system lacks the cs_CZ.UTF-8 locale
+SKIP: fmbtest
+PASS: foad1
+PASS: grep-dev-null
+PASS: grep-dir
+PASS: help-version
+in-eq-out-infloop: skipped test: your system has a non-GNU timeout program
+SKIP: in-eq-out-infloop
+PASS: include-exclude
+PASS: inconsistent-range
+invalid-multibyte-infloop: skipped test: your system has a non-GNU timeout program
+SKIP: invalid-multibyte-infloop
+PASS: khadafy
+long-line-vs-2GiB-read: skipped test: expensive: disabled by default
+SKIP: long-line-vs-2GiB-read
+max-count-overread: skipped test: your system has a non-GNU timeout program
+SKIP: max-count-overread
+PASS: max-count-vs-context
+mb-non-UTF8-performance: skipped test: your system has a non-GNU timeout program
+SKIP: mb-non-UTF8-performance
+PASS: multibyte-white-space
+PASS: multiple-begin-or-end-line
+PASS: null-byte
+PASS: empty-line-mb
+PASS: unibyte-bracket-expr
+PASS: unibyte-negated-circumflex
+PASS: high-bit-range
+PASS: options
+PASS: pcre
+PASS: pcre-abort
+pcre-infloop: skipped test: your system has a non-GNU timeout program
+SKIP: pcre-infloop
+PASS: pcre-invalid-utf8-input
+PASS: pcre-utf8
+PASS: pcre-w
+PASS: pcre-wx-backref
+PASS: pcre-z
+PASS: posix-bracket
+PASS: prefix-of-multibyte
+PASS: r-dot
+PASS: repetition-overflow
+PASS: reversed-range-endpoints
+PASS: skip-device
+sjis-mb: skipped test: your system has a non-GNU timeout program
+SKIP: sjis-mb
+PASS: spencer1
+PASS: spencer1-locale
+PASS: status
+PASS: surrogate-pair
+PASS: symlink
+turkish-eyes: skipped test: your tr_TR.UTF-8 locale appears to be broken
+SKIP: turkish-eyes
+PASS: turkish-I
+PASS: turkish-I-without-dot
+PASS: warn-char-classes
+PASS: word-delim-multibyte
+PASS: word-multi-file
+PASS: yesno
+============================================================================
+Testsuite summary for GNU grep 2.20
+============================================================================
+# TOTAL: 80
+# PASS:  65
+# SKIP:  14
+# XFAIL: 1
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make[4]: Leaving directory `$(@D)/tests'
+make[3]: Leaving directory `$(@D)/tests'
+make[2]: Leaving directory `$(@D)/tests'
+Making check in gnulib-tests
+make[2]: Entering directory `$(@D)/gnulib-tests'
+/usr/gnu/bin/make  check-recursive
+make[3]: Entering directory `$(@D)/gnulib-tests'
+Making check in .
+make[4]: Entering directory `$(@D)/gnulib-tests'
+/usr/gnu/bin/make  libtests.a test-alloca-opt test-argmatch test-binary-io test-bitrotate test-btowc test-c-ctype test-c-strcasecmp test-c-strncasecmp test-chdir test-cloexec test-close test-ctype test-dirent-safer test-dirent test-dup test-dup2 test-environ test-errno test-exclude test-fchdir test-fcntl-h test-fcntl-safer test-fcntl test-fdopen test-fdopendir test-fgetc test-float test-fnmatch test-fpending test-fputc test-fread test-fstat test-fstatat test-fwrite test-getcwd-lgpl test-getdtablesize test-getopt test-gettimeofday test-hash test-i-ring test-iconv-h test-iconv test-ignore-value test-intprops test-inttostr test-inttypes test-isatty test-isblank test-iswblank test-langinfo test-locale test-localeconv test-localename test-lseek test-lstat test-malloc-gnu test-malloca test-mbrtowc test-mbrtowc-w32 test-mbscasecmp test-mbsinit test-mbsrtowcs test-mbsstr1 test-mbsstr2 test-mbsstr3 test-memchr test-memchr2 test-memrchr test-nl_langinfo test-open test-openat-safer test-openat test-pathmax test-pipe test-quotearg-simple test-read test-realloc-gnu test-regex test-setenv test-setlocale1 test-setlocale2 test-snprintf test-stat test-stdbool test-stddef test-stdint test-stdio test-stdlib test-strerror test-striconv test-string test-strnlen test-strtoimax test-strtoll test-strtoull test-strtoumax test-symlink test-sys_stat test-sys_time test-sys_types test-time test-dup-safer test-unistd test-u8-mbtoucr test-u8-uctomb test-uc_width test-uc_width2 test-unsetenv test-vasnprintf test-verify test-version-etc test-wchar test-wcrtomb test-wcrtomb-w32 test-wctype-h test-wcwidth test-xalloc-die test-xstrtoimax test-xstrtol test-xstrtoul
+make[5]: Entering directory `$(@D)/gnulib-tests'
+"$(SOURCE_DIR)/gnulib-tests/test-xalloc-die.c", line 29: warning: statement not reached
+make[5]: Leaving directory `$(@D)/gnulib-tests'
+/usr/gnu/bin/make  check-TESTS
+make[5]: Entering directory `$(@D)/gnulib-tests'
+make[6]: Entering directory `$(@D)/gnulib-tests'
+PASS: test-alloca-opt
+PASS: test-argmatch
+PASS: test-binary-io.sh
+PASS: test-bitrotate
+PASS: test-btowc1.sh
+PASS: test-btowc2.sh
+PASS: test-c-ctype
+PASS: test-c-strcase.sh
+PASS: test-chdir
+PASS: test-cloexec
+PASS: test-close
+PASS: test-ctype
+PASS: test-dirent-safer
+PASS: test-dirent
+PASS: test-dup
+PASS: test-dup2
+PASS: test-environ
+PASS: test-errno
+PASS: test-exclude1.sh
+PASS: test-exclude2.sh
+PASS: test-exclude3.sh
+PASS: test-exclude4.sh
+PASS: test-exclude5.sh
+PASS: test-exclude6.sh
+PASS: test-exclude7.sh
+PASS: test-exclude8.sh
+PASS: test-fchdir
+PASS: test-fcntl-h
+PASS: test-fcntl-safer
+PASS: test-fcntl
+PASS: test-fdopen
+PASS: test-fdopendir
+PASS: test-fgetc
+PASS: test-float
+PASS: test-fnmatch
+PASS: test-fpending.sh
+PASS: test-fputc
+PASS: test-fread
+PASS: test-fstat
+PASS: test-fstatat
+PASS: test-fwrite
+PASS: test-getcwd-lgpl
+PASS: test-getdtablesize
+PASS: test-getopt
+PASS: test-gettimeofday
+PASS: test-hash
+PASS: test-i-ring
+PASS: test-iconv-h
+PASS: test-iconv
+PASS: test-ignore-value
+PASS: test-intprops
+PASS: test-inttostr
+PASS: test-inttypes
+PASS: test-isatty
+PASS: test-isblank
+PASS: test-iswblank
+PASS: test-langinfo
+PASS: test-locale
+PASS: test-localeconv
+PASS: test-localename
+PASS: test-lseek.sh
+PASS: test-lstat
+PASS: test-malloc-gnu
+PASS: test-malloca
+PASS: test-mbrtowc1.sh
+PASS: test-mbrtowc2.sh
+PASS: test-mbrtowc3.sh
+PASS: test-mbrtowc4.sh
+SKIP: test-mbrtowc-w32-1.sh
+SKIP: test-mbrtowc-w32-2.sh
+SKIP: test-mbrtowc-w32-3.sh
+SKIP: test-mbrtowc-w32-4.sh
+SKIP: test-mbrtowc-w32-5.sh
+SKIP: test-mbscasecmp.sh
+PASS: test-mbsinit.sh
+PASS: test-mbsrtowcs1.sh
+PASS: test-mbsrtowcs2.sh
+PASS: test-mbsrtowcs3.sh
+PASS: test-mbsrtowcs4.sh
+PASS: test-mbsstr1
+PASS: test-mbsstr2.sh
+PASS: test-mbsstr3.sh
+PASS: test-memchr
+PASS: test-memchr2
+PASS: test-memrchr
+PASS: test-nl_langinfo.sh
+PASS: test-open
+PASS: test-openat-safer
+PASS: test-openat
+PASS: test-pathmax
+PASS: test-pipe
+PASS: test-quotearg-simple
+PASS: test-read
+PASS: test-realloc-gnu
+PASS: test-regex
+PASS: test-setenv
+PASS: test-setlocale1.sh
+PASS: test-setlocale2.sh
+PASS: test-snprintf
+PASS: test-stat
+PASS: test-stdbool
+PASS: test-stddef
+PASS: test-stdint
+PASS: test-stdio
+PASS: test-stdlib
+PASS: test-strerror
+PASS: test-striconv
+PASS: test-string
+PASS: test-strnlen
+PASS: test-strtoimax
+PASS: test-strtoll
+PASS: test-strtoull
+PASS: test-strtoumax
+PASS: test-symlink
+PASS: test-sys_stat
+PASS: test-sys_time
+PASS: test-sys_types
+PASS: test-init.sh
+PASS: test-time
+PASS: test-dup-safer
+PASS: test-unistd
+PASS: test-u8-mbtoucr
+PASS: test-u8-uctomb
+PASS: test-uc_width
+PASS: uniwidth/test-uc_width2.sh
+PASS: test-unsetenv
+PASS: test-update-copyright.sh
+PASS: test-vasnprintf
+PASS: test-vc-list-files-git.sh
+PASS: test-vc-list-files-cvs.sh
+PASS: test-verify
+PASS: test-verify.sh
+PASS: test-version-etc.sh
+PASS: test-wchar
+PASS: test-wcrtomb.sh
+SKIP: test-wcrtomb-w32-1.sh
+SKIP: test-wcrtomb-w32-2.sh
+SKIP: test-wcrtomb-w32-3.sh
+SKIP: test-wcrtomb-w32-4.sh
+SKIP: test-wcrtomb-w32-5.sh
+PASS: test-wctype-h
+PASS: test-wcwidth
+PASS: test-xalloc-die.sh
+PASS: test-xstrtoimax.sh
+PASS: test-xstrtol.sh
+============================================================================
+Testsuite summary for GNU grep 2.20
+============================================================================
+# TOTAL: 145
+# PASS:  134
+# SKIP:  11
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make[6]: Leaving directory `$(@D)/gnulib-tests'
+make[5]: Leaving directory `$(@D)/gnulib-tests'
+make[4]: Leaving directory `$(@D)/gnulib-tests'
+make[3]: Leaving directory `$(@D)/gnulib-tests'
+make[2]: Leaving directory `$(@D)/gnulib-tests'
+make[2]: Entering directory `$(@D)'
+make[2]: Leaving directory `$(@D)'
+make[1]: Leaving directory `$(@D)'