--- a/components/librsync/Makefile Tue Feb 03 13:08:48 2015 -0800
+++ b/components/librsync/Makefile Tue Feb 03 13:45:43 2015 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -68,6 +68,16 @@
ASLR_MODE = $(ASLR_ENABLE)
+# 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
+
+# The additional librsync specific set of transforms to be applied to the
+# test results to try to normalize them.
+COMPONENT_TEST_TRANSFORMS += \
+ '-e "s|\(^$(CC)\).*|\\$$(CC)|" ' \
+ '-e "s|\(^/bin/bash ../libtool\).*|\1|" '
+
configure: $(CONFIGURE_32_and_64)
build: $(BUILD_32_and_64)