--- a/components/libsndfile/Makefile	Fri Dec 02 10:05:06 2016 -0800
+++ b/components/libsndfile/Makefile	Fri Dec 02 10:06:19 2016 -0800
@@ -36,15 +36,23 @@
 
 TPNO=			30616
 
+TEST_TARGET= install $(TEST_32_and_64)
+SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_32_and_64)
 include $(WS_MAKE_RULES)/common.mk
 
 # Needed to get tests/header_test.c to compile successfully on SPARC.
 gcc_XREGS.sparc=	-mapp-regs
 
+# Get correct libsndfile.so.1 from the proto area.
+TEST_LIBPATH.32 =	$(PROTOUSRLIBDIR)
+TEST_LIBPATH.64 =	$(PROTOUSRLIBDIR64)
+COMPONENT_TEST_ENV +=	LD_LIBRARY_PATH=$(TEST_LIBPATH.$(BITS))
+
 # Need to use GNU sed otherwise we get a:
 # Error : sfversion <version> and PACKAGE_VERSION <version> don't match."
 # failure from the test_wrapper.sh script.
 COMPONENT_TEST_ENV +=   PATH="$(GNUBIN):$(PATH)"
+COMPONENT_SYSTEM_TEST_ENV +=   PATH="$(GNUBIN):$(PATH)"
 
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
@@ -65,9 +73,7 @@
 	'-e "s|^.*argument:.*$$|XXX_REMOVE_XXX|g" ' \
 	'-e "s|^.*prototype:.*$$|XXX_REMOVE_XXX|g" ' \
 	'-e "s|^.*warning:.*$$|XXX_REMOVE_XXX|g" ' \
-	'-e "s|^make.*: Nothing to be.*$$|XXX_REMOVE_XXX|g" ' \
-	'-e "s|^make.*: Leaving directory.*$$|XXX_REMOVE_XXX|g" ' \
-	'-e "s|^make.*: Entering directory.*$$|XXX_REMOVE_XXX|g" ' \
+	'-e "s|^make.*$$|XXX_REMOVE_XXX|g" ' \
 	'-e "/^XXX_REMOVE_XXX$$/d" '
 
 REQUIRED_PACKAGES += codec/flac

--- a/components/libsndfile/test/results-all.master	Fri Dec 02 10:05:06 2016 -0800
+++ b/components/libsndfile/test/results-all.master	Fri Dec 02 10:06:19 2016 -0800
@@ -137,6 +137,10 @@
     float_scaled_test              : alac_32.caf ............. -226.0dB SNR ... ok
     float_scaled_test              : alac_24.caf ............. -153.1dB SNR ... ok
     float_scaled_test              : alac_20.caf ............. -125.9dB SNR ... ok
+    float_scaled_test              : flac_8.flac .............  -42.1dB SNR ... ok
+    float_scaled_test              : flac_16.flac ............  -90.2dB SNR ... ok
+    float_scaled_test              : flac_24.flac ............ -138.5dB SNR ... ok
+    float_scaled_test              : vorbis.oga ..............  -41.3dB SNR ... ok
     float_scaled_test              : replace_float.raw ....... -500.0dB SNR ... ok
     double_scaled_test             : double.raw .............. -500.0dB SNR ... ok
     double_scaled_test             : pcm_s8.raw ..............  -42.1dB SNR ... ok
@@ -167,6 +171,10 @@
     double_scaled_test             : alac_20.caf ............. -125.9dB SNR ... ok
     double_scaled_test             : alac_24.caf ............. -154.0dB SNR ... ok
     double_scaled_test             : alac_32.caf ............. -186.6dB SNR ... ok
+    double_scaled_test             : flac_8.flac .............  -42.1dB SNR ... ok
+    double_scaled_test             : flac_16.flac ............  -90.2dB SNR ... ok
+    double_scaled_test             : flac_24.flac ............ -138.6dB SNR ... ok
+    double_scaled_test             : vorbis.oga ..............  -41.3dB SNR ... ok
     double_scaled_test             : replace_double.raw ...... -500.0dB SNR ... ok
 
     float_short_little_test        : float_short_little.au ... ok
@@ -834,16 +842,31 @@
 ----------------------------------------------------------------------
   libsndfile-1.0.27 passed tests on MPC 2000 files.
 ----------------------------------------------------------------------
-    No FLAC tests because FLAC support was not compiled in.
-    No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.
-    No FLAC tests because FLAC support was not compiled in.
+    pcm_test_char                  : char.flac ............... ok
+    pcm_test_short                 : short.flac .............. ok
+    pcm_test_24bit                 : 24bit.flac .............. ok
+    compression_size_test          : q[36]_pcm16.flac ........ ok
+    string_start_test              : strings.flac ............ ok
 ----------------------------------------------------------------------
   libsndfile-1.0.27 passed tests on FLAC files.
 ----------------------------------------------------------------------
-    No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.
-    No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.
-    No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.
-    No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.
+    ogg_short_test                 : vorbis_short.oga ........ ok
+    ogg_seek_test                  : vorbis_short.oga ........ ok
+    ogg_int_test                   : vorbis_int.oga .......... ok
+    ogg_seek_test                  : vorbis_int.oga .......... ok
+    ogg_float_test                 : vorbis_float.oga ........ ok
+    ogg_seek_test                  : vorbis_float.oga ........ ok
+    ogg_double_test                : vorbis_double.oga ....... ok
+    ogg_seek_test                  : vorbis_double.oga ....... ok
+    ogg_stereo_seek_test           : vorbis_seek.ogg ......... ok
+    vorbis_test                    : vorbis_test.oga ......... ok
+    compression_size_test          : q[36]_vorbis.oga ........ ok
+    sdlcomp_test_short             : vorbis.oga .............. ok
+    sdlcomp_test_int               : vorbis.oga .............. ok
+    sdlcomp_test_float             : vorbis.oga .............. Not working for this format.
+    sdlcomp_test_double            : vorbis.oga .............. Not working for this format.
+    string_start_test              : vorbis.oga .............. ok
+    zero_data_test                 : zerolen.oga ............. ok
     permission_test                : readonly.oga ............ ok
 ----------------------------------------------------------------------
   libsndfile-1.0.27 passed tests on OGG/VORBIS files.