--- 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/conflict/test/results-64.master Wed Jan 07 16:57:24 2015 -0800
@@ -0,0 +1,36 @@
+**
+** Set PATH = .:$(@D):/bin
+** This produces no conflict (unless /bin contains conflict!):
+Current working directory is "$(@D)"
+-> .
+--> /bin
+*+: conflict
+**
+** Set PATH = .:$(@D):/bin
+** This shows conflict between different filetypes
+Current working directory is "$(@D)"
+:----> .
+:----:----> /bin
+:co.-:--.-: conflict (.c,.o,)
+**
+** Set PATH = .:$(@D):/bin
+** This repeats the last test, with pathnames-only
+./conflict.c
+./conflict.o
+./conflict
+/bin/conflict
+**
+** Add a dummy executable in the current directory
+** /tmp/conflict.xxxxxx
+**
+** producing a conflict with the executable
+** $(@D)/conflict
+**
+** For Unix, the conflict will be in the empty suffix (first column
+** of the report). For Win32 it will be in the combination of empty
+** and "e" (.exe) suffixes.
+Current working directory is "/tmp/conflict.xxxxxx"
+:---> .
+:---:---> $(@D)
+:---:---:---> /bin
+:.--:.--:.--: conflict ()