--- a/components/conflict/Makefile Fri Dec 19 15:13:21 2014 -0800
+++ b/components/conflict/Makefile Wed Jan 07 16:57:24 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# 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
@@ -61,6 +61,11 @@
COMPONENT_TEST_CMD = ./run_test.sh
COMPONENT_TEST_TARGETS =
+# The additional conflict specific set of transforms to be applied to the
+# test results to try to normalize them.
+COMPONENT_TEST_TRANSFORMS += \
+ '-e "s|/tmp/conflict\.......|/tmp/conflict\.xxxxxx|g" '
+
ASLR_MODE = $(ASLR_ENABLE)
# common targets