--- a/components/doxygen/Makefile	Fri Jan 16 13:13:26 2015 -0800
+++ b/components/doxygen/Makefile	Fri Jan 16 13:30:16 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
 
@@ -70,6 +70,13 @@
 COMPONENT_TEST_DIR =		$(BUILD_DIR_64)/testing
 COMPONENT_TEST_TARGETS =	tests
 
+# The additional doxygen specific set of transforms to be applied to the
+# test results to try to normalize them.
+COMPONENT_TEST_TRANSFORMS += \
+        '-e "s|\(error opening bib\).*|\1|" ' \
+        '-e "s|\(test_output_012/indexpage.xml\).*|\1|" ' \
+        '-e "s|\(012/indexpage.xml\).*|\1|" '
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/doxygen/test/results-64.master	Fri Jan 16 13:30:16 2015 -0800
@@ -0,0 +1,78 @@
+make[1]: Entering directory `$(@D)/testing'
+1..56
+ok 1 - [001_a.dox]: test the \a and \mainpage commands
+ok 2 - [002_addindex.dox]: test \addindex command
+ok 3 - [003_anchor.dox]: test \anchor command
+ok 4 - [004_arg.dox]: test \arg and \li commands
+ok 5 - [005_attention.dox]: test \attention, \not, \remark, \warning, and \par commands
+ok 6 - [006_author.dox]: test the \author, \since, and \version command
+ok 7 - [007_b.dox]: test the \b command
+ok 8 - [008_brief.c]: test \brief and \file command
+ok 9 - [009_bug.cpp]: test the \bug, \deprecated, \todo, \test, and \xrefitem commands
+ok 10 - [010_c.dox]: test the \c and \p commands
+ok 11 - [011_category.m]: test the \interface and \category command
+error opening bib
+bibtex command failed: No such file or directory
+not ok 12 - [012_cite.dox]: test the \cite command
+#   Failed test '[012_cite.dox]: test the \cite command'
+#   at runtests.pl line 249.
+# Difference between generated output and reference:
+# --- test_output_012/indexpage.xml
+# +++ 012/indexpage.xml
+# @@ -4,7 +4,7 @@
+#      <compoundname>index</compoundname>
+#      <title>My Project</title>
+#      <detaileddescription>
+# -      <para>See <ref refid="citelist_1CITEREF_knuth79" kindref="member">knuth79</ref> for more info. </para>
+# +      <para>See <ref refid="citelist_1CITEREF_knuth79" kindref="member">[1]</ref> for more info. </para>
+#      </detaileddescription>
+#    </compounddef>
+#  </doxygen>
+ok 13 - [013_class.h]: test the \class and \headerfile commands
+ok 14 - [014_code.dox]: test the \code command
+ok 15 - [015_cond.c]: test the \cond command
+ok 16 - [016_copydoc.c]: test the \copydoc, \copybrief, \copydetails, and \details commands
+ok 17 - [017_copyright.dox]: test \copyright and \date commands
+ok 18 - [018_def.c]: test the \def, \var, \fn, and \typedef commands
+ok 19 - [019_defgroup.c]: test the \defgroup, \addtogroup, and \ingroup command.
+ok 20 - [020_only.dox]: test the \*only and \*endonly commands
+ok 21 - [021_dontinclude.cpp]: test the \dontinclude, \skip, \until, \skipline, \line commands
+ok 22 - [022_dot.cpp]: test the \dot and \enddot commands
+ok 23 - [023_e.dox]: test the \e, \em commands
+ok 24 - [024_if.dox]: test the \if, \ifnot, \elsif, \else, and \endif commands
+ok 25 - [025_example.cpp]: test the \example command
+ok 26 - [026_exception.cpp]: test the \exception, \param, and \tparam commands
+ok 27 - [027_extends.c]: test the \extends, \implements, \memberof, \private, and \public commands
+ok 28 - [028_formula.c]: test the \f$, \f[, \f], \f{, and \f} commands
+ok 29 - [029_hideinit.c]: test the \hideinitializer command
+ok 30 - [030_htmlinclude.dox]: test the \htmlinclude command
+ok 31 - [031_image.dox]: test the \image command
+ok 32 - [032_include.cpp]: test the \include and \includelineno commands
+ok 33 - [033_internal.dox]: test the \internal and \endinternal commands (1)
+ok 34 - [034_internal.dox]: test the \internal and \endinternal commands (2)
+ok 35 - [035_invariant.c]: test \invariant, \pre and \post commands
+ok 36 - [036_link.c]: test \link command
+ok 37 - [037_msc.cpp]: test the \msc and \endmsc commands
+ok 38 - [038_n.dox]: test the \n command
+ok 39 - [039_name.cpp]: test the \name and \short commands
+ok 40 - [040_namespace.cpp]: test the \namespace command
+ok 41 - [041_overload.cpp]: test the \overload command
+ok 42 - [042_package.java]: test the \package command
+ok 43 - [043_page.dox]: test \page, \subpage, \*section, \paragraph, and \ref commands
+ok 44 - [044_section.h]: test the \(public|protected|private)section commands
+ok 45 - [045_refitem.dox]: test \refitem, \secreflist, \endsecreflist
+ok 46 - [046_related.cpp]: test the \related, \relatedalso, \see, and \sa commands
+ok 47 - [047_return.cpp]: test the \result, \return, and \returns commands
+ok 48 - [048_showinit.c]: test the \showinit command
+ok 49 - [049_snippet.cpp]: test the \snippet command
+ok 50 - [050_verbatim.dox]: test \verbatim and \verbinclude commands
+ok 51 - [051_escape.dox]: test various characters that should be escaped
+ok 52 - [052_tilde.dox]: test \~ command
+warning: Output language Dutch not supported! Using English instead.
+ok 53 - [053_tilde.dox]: test \~ command with non default OUTPUT_LANGUAGE
+ok 54 - [054_parblock.cpp]: test the \parblock command
+ok 55 - [055_markdown.md]: test markdown parsing
+ok 56 - [056_latexinclude.dox]: test the \latexinclude command
+# Looks like you failed 1 test of 56.
+make[1]: *** [tests] Error 1
+make[1]: Leaving directory `$(@D)/testing'

--- a/components/libssh2/Makefile	Fri Jan 16 13:13:26 2015 -0800
+++ b/components/libssh2/Makefile	Fri Jan 16 13:30:16 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -49,6 +49,19 @@
         $(GSED) -i -e 's|3|3ssh2|g' \
 		$(PROTOUSRSHAREMAN3DIR)/libssh2_sftp_fstatvfs.3;
 
+# Master test results are the same for both 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 libssh2 specific set of transforms to be applied to the
+# test results to try to normalize them.
+# The cc and libtool lines need to be deleted because x86 and SPARC have
+# different command line arguments.
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "/^\/ws\/on12-tools\/SUNWspro\/solarisstudio12.3\/bin\/cc/d" ' \
+	'-e "/^\/bin\/bash ..\/libtool/d" ' \
+	'-e "/^libtool: link:/d" '
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libssh2/test/results-all.master	Fri Jan 16 13:30:16 2015 -0800
@@ -0,0 +1,36 @@
+make[1]: Entering directory `$(@D)'
+Making check in src
+make[2]: Entering directory `$(@D)/src'
+make[2]: Leaving directory `$(@D)/src'
+Making check in tests
+make[2]: Entering directory `$(@D)/tests'
+/usr/gnu/bin/make  simple
+make[3]: Entering directory `$(@D)/tests'
+source='$(SOURCE_DIR)/tests/simple.c' object='simple.o' libtool=no \
+DEPDIR=.deps depmode=none /bin/bash $(SOURCE_DIR)/depcomp \
+make[3]: Leaving directory `$(@D)/tests'
+/usr/gnu/bin/make  check-TESTS
+make[3]: Entering directory `$(@D)/tests'
+PASS: simple
+usage:	man [-] [-adFlprt] [-M path] [-T macro-package ] [ -s section ] name ...
+	man [-M path] [-s section] -k keyword ...
+	man [-M path] -f file ... 
+	man [-M path] [-s section] -K keyword ...
+SKIP: mansyntax.sh
+======================
+All 1 tests passed
+(1 tests were not run)
+======================
+make[3]: Leaving directory `$(@D)/tests'
+make[2]: Leaving directory `$(@D)/tests'
+Making check in docs
+make[2]: Entering directory `$(@D)/docs'
+make[2]: Nothing to be done for `check'.
+make[2]: Leaving directory `$(@D)/docs'
+Making check in example
+make[2]: Entering directory `$(@D)/example'
+make[2]: Leaving directory `$(@D)/example'
+make[2]: Entering directory `$(@D)'
+make[2]: Nothing to be done for `check-am'.
+make[2]: Leaving directory `$(@D)'
+make[1]: Leaving directory `$(@D)'

--- a/components/lua/Makefile	Fri Jan 16 13:13:26 2015 -0800
+++ b/components/lua/Makefile	Fri Jan 16 13:30:16 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
 
@@ -83,6 +83,18 @@
 COMPONENT_TEST_ARGS =		-e"_U=true"
 COMPONENT_TEST_TARGETS =	all.lua
 
+# Master test results are the same for both 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 lua specific set of transforms to be applied to the
+# test results to try to normalize them.
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "/---- total memory:/d" ' \
+	'-e "s|elements in .\... sec|elements in x.xx sec|g" ' \
+	'-e "s|\(total time:\).*|\1|" ' \
+	'-e "s|\(test done on\).*|\1|" '
+
 # common targets
 build:		$(BUILD_32_and_64)
 

--- a/components/lua/files/fix-tests.patch	Fri Jan 16 13:13:26 2015 -0800
+++ b/components/lua/files/fix-tests.patch	Fri Jan 16 13:30:16 2015 -0800
@@ -33,3 +33,20 @@
    assert(f:close())
  end
  
+
+In order to generate consistent output from the lua tests, we need to
+remove the writing of a '.' to stderr (to show progress).
+
+This change will not be passed upstream.
+
+--- all.lua.orig	2015-01-16 07:15:53.098166988 -0800
++++ all.lua	2015-01-16 07:16:48.982837677 -0800
+@@ -140,7 +140,7 @@
+   -- each time a table is collected, create a new one to be
+   -- collected next cycle
+   mt.__gc = function (o)
+-    stderr:write'.'    -- mark progress
++    -- stderr:write'.'    -- mark progress
+     -- assert(eph[o]() == o and next(eph) == o and next(eph, o) == nil)
+     local n = setmetatable({}, mt)   -- replicate object
+     eph[n] = function () return n end

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lua/test/results-all.master	Fri Jan 16 13:30:16 2015 -0800
@@ -0,0 +1,226 @@
+current path:
+****?;./?.lua/usr/share/lua/5.2/?.lua;/usr/share/lua/5.2/?/init.lua;/usr/lib/lua/5.2/?.lua;/usr/lib/lua/5.2/?/init.lua;./?.lua****
+
+
+
+***** FILE 'main.lua'*****
+
+***** FILE 'gc.lua'*****
+testing garbage collection
+tables
+strings
+functions
+functions with errors
+long strings
+steps
+steps (2)
+clearing tables
+weak tables
++
+OK
+
+
+***** FILE 'db.lua'*****
+testing debug library and debug information
++
++
++
+OK
+
+
+***** FILE 'calls.lua'*****
+testing functions and calls
++
++
++
++
+OK
+testing strings and string library
++
++
++
++
++
+OK
+testing scanner
++
++
++
++
++
+OK
+
+
+***** FILE 'attrib.lua'*****
+testing assignments, logical operators, and constructors
++
+OK
+testing strings and string library
++
++
++
++
++
+OK
+testing scanner
++
++
++
++
++
+OK
+
+
+***** FILE 'constructs.lua'*****
+testing syntax
++
++
++
++
++
++
++
+testing short-circuit optimizations
++
++
++
+OK
+
+
+***** FILE 'api.lua'*****
+
+
+***** FILE 'locals.lua'*****
+testing local variables and environments
++
+OK
+
+
+***** FILE 'constructs.lua'*****
+testing syntax
++
++
++
++
++
++
++
+testing short-circuit optimizations
++
++
++
+OK
+
+
+***** FILE 'code.lua'*****
+
+
+***** FILE 'nextvar.lua'*****
+testing tables, next, and for
++
++
++
++
+OK
+
+
+***** FILE 'pm.lua'*****
+testing pattern matching
++
++
++
++
+OK
+
+
+***** FILE 'api.lua'*****
+
+
+***** FILE 'events.lua'*****
+testing metatables
++
++
+OK
+
+
+***** FILE 'vararg.lua'*****
+testing vararg
++
++
++
+OK
+
+
+***** FILE 'closure.lua'*****
+testing closures
++
+OK
+
+
+***** FILE 'coroutine.lua'*****
+testing coroutines
++
+testing yields inside metamethods
++
+testing yields inside 'for' iterators
+
+
+***** FILE 'goto.lua'*****
+OK
+
+
+***** FILE 'errors.lua'*****
+testing errors
++
++
++
+OK
+
+
+***** FILE 'math.lua'*****
+testing numbers and math lib
+OK
+
+
+***** FILE 'sort.lua'*****
+testing (parts of) table library
+testing unpack
+testing pack
+testing sort
+Sorting 5000 elements in x.xx sec.
+Re-sorting 5000 elements in x.xx sec.
+Invert-sorting other 5000 elements in x.xx sec., with 64698 comparisons
+Sorting 5000 equal elements in x.xx sec.
+OK
+
+
+***** FILE 'bitwise.lua'*****
+testing bitwise operations
++
++
+OK
+
+
+***** FILE 'verybig.lua'*****
+testing RK
+
+
+***** FILE 'files.lua'*****
+testing i/o
++
++
++
++
++
++
+test done on
+Lua 5.2
+final OK !!!
+cleaning all!!!!
+
+
+
+total time:
+
+>>> closing state <<<
+

--- a/components/tidy/Makefile	Fri Jan 16 13:13:26 2015 -0800
+++ b/components/tidy/Makefile	Fri Jan 16 13:30:16 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
@@ -63,6 +63,14 @@
 $(PROTODOCDIR):
 	$(MKDIR) $@
 
+COMPONENT_TEST_DIR =    $(@D)/test
+COMPONENT_TEST_CMD =	./testall.sh
+COMPONENT_TEST_TARGETS =
+
+# Master test results are the same for both 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
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tidy/test/results-all.master	Fri Jan 16 13:30:16 2015 -0800
@@ -0,0 +1,211 @@
+Testing 426885
+Testing 427633
+Testing 427662
+Testing 427664
+Testing 427671
+Testing 427672
+Testing 427675
+Testing 427676
+Testing 427677
+Testing 427810
+Testing 427811
+Testing 427813
+Testing 427816
+Testing 427818
+Testing 427819
+Testing 427820
+Testing 427821
+Testing 427822
+Testing 427823
+Testing 427825
+Testing 427826
+Testing 427827
+Testing 427830
+Testing 427833
+Testing 427834
+Testing 427835
+Testing 427836
+Testing 427837
+Testing 427838
+Testing 427839
+Testing 427840
+Testing 427841
+Testing 427844
+Testing 427845
+Testing 427846
+Testing 431716
+Testing 431719
+Testing 431721
+Testing 431731
+Testing 431736
+Testing 431739
+Testing 431874
+Testing 431883
+Testing 431889
+Testing 431895
+Testing 431898
+Testing 431958
+Testing 431964
+Testing 432677
+Testing 433012
+Testing 433021
+Testing 433040
+Testing 433359
+Testing 433360
+Testing 433604
+Testing 433607
+Testing 433656
+Testing 433666
+Testing 433672
+Testing 433856
+Testing 434047
+Testing 434100
+Testing 434940
+Testing 435903
+Testing 435909
+Testing 435917
+Testing 435919
+Testing 435920
+Testing 435922
+Testing 435923
+Testing 437468
+Testing 438650
+Testing 438658
+Testing 438954
+Testing 438956
+Testing 441508
+Testing 441568
+Testing 443362
+Testing 443576
+Testing 443678
+Testing 445074
+Testing 445394
+Testing 445557
+Testing 449348
+Testing 470663
+Testing 473490
+Testing 480406
+Testing 480701
+Testing 487204
+Testing 487283
+Testing 500236
+Testing 501669
+Testing 503436
+Testing 504206
+Testing 505770
+Testing 511679
+Testing 511243
+Testing 533233
+Testing 540571
+Testing 543262
+Testing 545772
+Testing 553468
+Testing 566542
+Testing 586555
+Testing 586562
+Testing 588061
+Testing 590716
+Testing 593705
+Testing 616744
+Testing 620531
+Testing 629885
+Testing 634889
+Testing 640473
+Testing 640474
+Testing 646946
+Testing 647255
+Testing 647900
+Testing 649812
+Testing 655338
+Testing 656889
+Testing 658230
+Testing 660397
+Testing 661606
+Testing 671087
+Testing 676156
+Testing 676205
+Testing 678268
+Testing 688746
+Testing 695408
+Testing 696799
+Testing 706260
+Testing 765852
+Testing 836462
+Testing 836462-2
+Testing 837023
+Testing 978947
+Testing 996484
+Testing 1002509
+Testing 1003361
+Testing 1004051
+Testing 1004512
+Testing 1014993
+Testing 1015959
+Testing 1027888
+Testing 1050673
+Testing 1052758
+Testing 1053626
+Testing 1055304
+Testing 1055398
+Testing 1056023
+Testing 1056910
+Testing 1062345
+Testing 1062511
+Testing 1063256
+Testing 1067112
+Testing 1068087
+Testing 1069549
+Testing 1069553
+Testing 1072528
+Testing 1078345
+Testing 1079820
+Testing 1086083
+Testing 1090318
+Testing 1098012
+Testing 1107622
+Testing 1117013
+Testing 1115094
+Testing 1145571
+Testing 1145572
+Testing 1183751
+Testing 1198501
+Testing 1207443
+Testing 1210752
+Testing 1231279
+Testing 1235296
+Testing 1241723
+Testing 1263391
+Testing 1266647
+Testing 1282835
+Testing 1286029
+Testing 1286278
+Testing 1316258
+Testing 1316307
+Testing 1316307-2
+Testing 1326520
+Testing 1331849
+Testing 1333579
+Testing 1359292
+Testing 1398397
+Testing 1407266
+Testing 1408034
+Testing 1410061
+Testing 1410061-1
+Testing 1410061-2
+Testing 1415137
+Testing 1423252
+Testing 1426419
+Testing 1436578
+Testing 1452744
+Testing 1445570
+Testing 1503897
+Testing 1586158
+Testing 1590220-1
+Testing 1590220-2
+Testing 1603538-1
+Testing 1603538-2
+Testing 1610888-1
+Testing 1610888-2
+Testing 1632470
+Testing 1632218
+Testing 1638062