--- a/components/zlib/Makefile	Tue Nov 03 06:46:03 2015 -0800
+++ b/components/zlib/Makefile	Wed Nov 04 02:38:31 2015 -0800
@@ -106,6 +106,12 @@
 
 COMPONENT_TEST_TARGETS = test
 
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+COMPONENT_TEST_TRANSFORMS += '-e "/^zlib version/s/0x..$$/0xXX/" '
+
+COMPONENT_SYSTEM_TEST_TARGETS= test SYSTEM_TEST=1
+
 configure:	$(CONFIGURE_32_and_64)
 
 build:		$(BUILD_32_and_64)
@@ -114,7 +120,7 @@
 
 test:		$(TEST_32_and_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:    $(BUILD_32_and_64) $(SYSTEM_TEST_32_and_64)
 
 clean::
 	$(RM) -r $(BUILD_DIR) $(PROTO_DIR) capabilities/*/*/*.o capabilities/*/$(MACH32)/*.s

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/zlib/patches/system-test.patch	Wed Nov 04 02:38:31 2015 -0800
@@ -0,0 +1,20 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+Allows to test minigzip with installed version of zlib.
+
+--- zlib-1.2.8/Makefile.in
++++ zlib-1.2.8/Makefile.in
+@@ -92,9 +92,11 @@
+ 	rm -f $$TMPST
+ 
+ testshared: shared
+-	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
++	@if test -z $(SYSTEM_TEST); then \
++	LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+ 	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
+ 	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
++	fi; \
+ 	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
+ 	TMPSH=tmpsh_$$; \
+ 	if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/zlib/test/results-all.master	Wed Nov 04 02:38:31 2015 -0800
@@ -0,0 +1,32 @@
+make[1]: Entering directory `$(@D)'
+hello world
+zlib version 1.2.8-T4mods = 0x128f, compile flags = 0xXX
+uncompress(): hello, hello!
+gzread(): hello, hello!
+gzgets() after gzseek:  hello!
+inflate(): hello, hello!
+large_inflate(): OK
+after inflateSync(): hello, hello!
+inflate with dictionary: hello, hello!
+		*** zlib test OK ***
+hello world
+zlib version 1.2.8-T4mods = 0x128f, compile flags = 0xXX
+uncompress(): hello, hello!
+gzread(): hello, hello!
+gzgets() after gzseek:  hello!
+inflate(): hello, hello!
+large_inflate(): OK
+after inflateSync(): hello, hello!
+inflate with dictionary: hello, hello!
+		*** zlib shared test OK ***
+hello world
+zlib version 1.2.8-T4mods = 0x128f, compile flags = 0xXX
+uncompress(): hello, hello!
+gzread(): hello, hello!
+gzgets() after gzseek:  hello!
+inflate(): hello, hello!
+large_inflate(): OK
+after inflateSync(): hello, hello!
+inflate with dictionary: hello, hello!
+		*** zlib 64-bit test OK ***
+make[1]: Leaving directory `$(@D)'