--- a/components/librsync/Makefile	Fri Dec 02 10:03:48 2016 -0800
+++ b/components/librsync/Makefile	Fri Dec 02 10:05:06 2016 -0800
@@ -50,6 +50,8 @@
 
 CLEAN_PATHS += $(COMPONENT_NAME_1)
 
+TEST_TARGET= install $(TEST_32_and_64)
+SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_32_and_64)
 include $(WS_MAKE_RULES)/common.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
@@ -62,6 +64,14 @@
 
 PROTOUSRSHAREDOCDIR = $(PROTOUSRSHAREDIR)/doc/librsync-0.9.7
 
+# Get correct librsync.so.1 from the proto area.
+TEST_LIBPATH.32 =		$(PROTOUSRLIBDIR)
+TEST_LIBPATH.64 =		$(PROTOUSRLIBDIR64)
+COMPONENT_TEST_ENV +=		LD_LIBRARY_PATH=$(TEST_LIBPATH.$(BITS))
+
+COMPONENT_TEST_DIR =		$(@D)/testsuite
+COMPONENT_SYSTEM_TEST_DIR =	$(@D)/testsuite
+
 # Master test results are the same for 32-bit and 64-bit, so override
 # here, rather than create multiple identical master files.
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
@@ -69,6 +79,13 @@
 # The additional librsync specific set of transforms to be applied to the
 # test results to try to normalize them.
 COMPONENT_TEST_TRANSFORMS += \
+	'-e "/Entering directory/d"' \
+	'-e "/Leaving directory/d"' \
+	'-e "/check-TESTS/d"' \
+	'-e "/depmode/d"' \
+	'-e "/isprefix.driver/d"' \
+	'-e "/^mkdir/d"' \
+	'-e "/^make/d"' \
 	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|g" ' \
 	'-e "s|^.*source=.*libtool=no.*$$|XXX_CC_XXX|g" ' \
 	'-e "/^XXX_CC_XXX$$/d" '

--- a/components/librsync/test/results-all.master	Fri Dec 02 10:03:48 2016 -0800
+++ b/components/librsync/test/results-all.master	Fri Dec 02 10:05:06 2016 -0800
@@ -1,23 +1,3 @@
-make[1]: Entering directory `$(@D)'
-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 popt
-make[2]: Entering directory `$(@D)/popt'
-make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `$(@D)/popt'
-Making check in testsuite
-make[2]: Entering directory `$(@D)/testsuite'
-/usr/gnu/bin/make  isprefix.driver
-make[3]: Entering directory `$(@D)/testsuite'
-depfile='.deps/isprefix.driver.Po' tmpdepfile='.deps/isprefix.driver.TPo' \
-depmode=none /bin/bash $(SOURCE_DIR)/depcomp \
-"isprefix.driver.c", line 43: warning: implicit function declaration: strcmp
-mkdir .libs
-make[3]: Leaving directory `$(@D)/testsuite'
-/usr/gnu/bin/make  check-TESTS
-make[3]: Entering directory `$(@D)/testsuite'
 signature.test: .........OK
 PASS: signature.test
 mutate.test: ....................................................................................................OK
@@ -37,8 +17,3 @@
 ==================
 All 8 tests passed
 ==================
-make[3]: Leaving directory `$(@D)/testsuite'
-make[2]: Leaving directory `$(@D)/testsuite'
-make[2]: Entering directory `$(@D)'
-make[2]: Leaving directory `$(@D)'
-make[1]: Leaving directory `$(@D)'