--- a/components/autogen/Makefile	Wed Jan 07 08:08:47 2015 -0800
+++ b/components/autogen/Makefile	Wed Jan 07 08:11:51 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
 
@@ -61,7 +61,10 @@
 	$(GSED) -i -e 's| tr | /usr/gnu/bin/tr |' \
 		$(SOURCE_DIR)/autoopts/test/vendor.test
 
-# Enable ASLR for this component
+# 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/autogen/test/results-all.master	Wed Jan 07 08:11:51 2015 -0800
@@ -0,0 +1,174 @@
+Making check in compat
+make[1]: Entering directory `$(@D)/compat'
+make[1]: Nothing to be done for `check'.
+make[1]: Leaving directory `$(@D)/compat'
+Making check in snprintfv
+make[1]: Entering directory `$(@D)/snprintfv'
+make[1]: Nothing to be done for `check'.
+make[1]: Leaving directory `$(@D)/snprintfv'
+Making check in autoopts
+make[1]: Entering directory `$(@D)/autoopts'
+Making check in test
+make[2]: Entering directory `$(@D)/autoopts/test'
+/usr/gnu/bin/make  check-TESTS
+make[3]: Entering directory `$(@D)/autoopts/test'
+PASS: alias.test
+PASS: argument.test
+PASS: cfg-edit.test
+PASS: cond.test
+PASS: config.test
+PASS: doc.test
+PASS: enums.test
+PASS: equiv.test
+PASS: errors.test
+PASS: getopt.test
+PASS: handler.test
+PASS: immediate.test
+PASS: keyword.test
+PASS: library.test
+PASS: main.test
+PASS: nested.test
+PASS: nls.test
+PASS: rc.test
+PASS: shell.test
+PASS: stdopts.test
+PASS: time.test
+PASS: usage.test
+PASS: vendor.test
+PASS: vers.test
+===================
+All 24 tests passed
+===================
+make[3]: Leaving directory `$(@D)/autoopts/test'
+make[2]: Leaving directory `$(@D)/autoopts/test'
+make[2]: Entering directory `$(@D)/autoopts'
+AGexe="$(@D)/agen5/autogen" GDexe="$(@D)/getdefs/getdefs" CLexe="$(@D)/columns/columns" srcdir="$(SOURCE_DIR)/autoopts"     top_srcdir="$(SOURCE_DIR)" builddir="." top_builddir=".." POSIX_SHELL="/bin/bash" \
+    /bin/bash $(SOURCE_DIR)/autoopts/mk-tpl-config.sh tpl-config-stamp autoopts/options.h autoopts/usage-txt.h genshell.h xat-attribute.h value-type.h ao-strs.h ag-char-map.h autoopts.h project.h proto.h parse-duration.c ao-strs.c value-type.c xat-attribute.c autoopts.c alias.c    boolean.c   check.c     configfile.c cook.c enum.c     env.c       file.c      find.c       genshell.c load.c     makeshell.c nested.c    numeric.c    pgusage.c putshell.c reset.c     restore.c   save.c       sort.c stack.c    streqvcmp.c text_mmap.c time.c       tokenize.c usage.c    version.c
+! $(@D)/agen5/autogen -L$(SOURCE_DIR)/autoopts/tpl -L./tpl -Tagman3.tpl $(SOURCE_DIR)/autoopts/funcs.def
+make[2]: Leaving directory `$(@D)/autoopts'
+make[1]: Leaving directory `$(@D)/autoopts'
+Making check in agen5
+make[1]: Entering directory `$(@D)/agen5'
+Making check in test
+make[2]: Entering directory `$(@D)/agen5/test'
+/usr/gnu/bin/make  check-TESTS
+make[3]: Entering directory `$(@D)/agen5/test'
++ /usr/gnu/bin/sed -e '/^ *srcdir=/[email protected]".*"@"$(SOURCE_DIR)/agen5/test"@' -e '/^ *top_srcdir=/[email protected]".*"@"$(SOURCE_DIR)"@' ../../autoopts/test/defs
++ cd $(SOURCE_DIR)/agen5/test
++ chmod +x alist.test case.test columns.test daemon.test debug.test define.test defref.test directives.test dynref.test endmac.test error.test expr.test extract.test for.test forfrom.test forin.test format.test get.test gperf.test heredef.test html.test in.test include.test leave.test license.test line.test loop.test make.test match.test opts.test output.test pseudo.test reorder.test shell.test snarf.test stack.test stress.test string.test strtable.test strxform.test suffix.test time.test
+PASS: define.test
+PASS: directives.test
+PASS: error.test
+PASS: expr.test
+PASS: extract.test
+PASS: include.test
+PASS: opts.test
+PASS: output.test
+PASS: snarf.test
+PASS: suffix.test
+PASS: shell.test
+PASS: alist.test
+PASS: case.test
+PASS: columns.test
+PASS: debug.test
+PASS: defref.test
+PASS: dynref.test
+PASS: endmac.test
+PASS: for.test
+PASS: forfrom.test
+PASS: forin.test
+PASS: format.test
+PASS: get.test
+PASS: gperf.test
+PASS: heredef.test
+PASS: html.test
+PASS: in.test
+PASS: leave.test
+PASS: license.test
+PASS: line.test
+PASS: loop.test
+PASS: make.test
+PASS: match.test
+PASS: pseudo.test
+PASS: reorder.test
+PASS: stack.test
+PASS: stress.test
+PASS: string.test
+PASS: strtable.test
+PASS: strxform.test
+PASS: time.test
+===================
+All 41 tests passed
+===================
+make[3]: Leaving directory `$(@D)/agen5/test'
+make[2]: Leaving directory `$(@D)/agen5/test'
+make[2]: Entering directory `$(@D)/agen5'
+make[2]: Nothing to be done for `check-am'.
+make[2]: Leaving directory `$(@D)/agen5'
+make[1]: Leaving directory `$(@D)/agen5'
+Making check in columns
+make[1]: Entering directory `$(@D)/columns'
+top_builddir=.. \
+$(@D)/agen5/autogen -L$(SOURCE_DIR)/autoopts/tpl -L../autoopts/tpl -MFstamp-agtexi -Tagtexi-cmd.tpl -DLEVEL=section $(SOURCE_DIR)/columns/opts.def
+/usr/gnu/bin/make  check-am
+make[2]: Entering directory `$(@D)/columns'
+make[2]: Nothing to be done for `check-am'.
+make[2]: Leaving directory `$(@D)/columns'
+make[1]: Leaving directory `$(@D)/columns'
+Making check in getdefs
+make[1]: Entering directory `$(@D)/getdefs'
+/usr/gnu/bin/make  check-recursive
+make[2]: Entering directory `$(@D)/getdefs'
+Making check in test
+make[3]: Entering directory `$(@D)/getdefs/test'
+/usr/gnu/bin/make  check-TESTS
+make[4]: Entering directory `$(@D)/getdefs/test'
+cd $(SOURCE_DIR)/getdefs/test ; chmod +x *.test
+PASS: cfg.test
+PASS: index.test
+PASS: option.test
+PASS: subblock.test
+==================
+All 4 tests passed
+==================
+make[4]: Leaving directory `$(@D)/getdefs/test'
+cd $(SOURCE_DIR)/getdefs/test ; chmod +x *.test
+make[3]: Leaving directory `$(@D)/getdefs/test'
+make[3]: Entering directory `$(@D)/getdefs'
+make[3]: Leaving directory `$(@D)/getdefs'
+make[2]: Leaving directory `$(@D)/getdefs'
+make[1]: Leaving directory `$(@D)/getdefs'
+Making check in xml2ag
+make[1]: Entering directory `$(@D)/xml2ag'
+/usr/gnu/bin/make  check-recursive
+make[2]: Entering directory `$(@D)/xml2ag'
+Making check in test
+make[3]: Entering directory `$(@D)/xml2ag/test'
+/usr/gnu/bin/make  check-TESTS
+make[4]: Entering directory `$(@D)/xml2ag/test'
+cd $(SOURCE_DIR)/xml2ag/test ; chmod +x *.test
+PASS: convert.test
+=============
+1 test passed
+=============
+make[4]: Leaving directory `$(@D)/xml2ag/test'
+cd $(SOURCE_DIR)/xml2ag/test ; chmod +x *.test
+make[3]: Leaving directory `$(@D)/xml2ag/test'
+make[3]: Entering directory `$(@D)/xml2ag'
+make[3]: Nothing to be done for `check-am'.
+make[3]: Leaving directory `$(@D)/xml2ag'
+make[2]: Leaving directory `$(@D)/xml2ag'
+make[1]: Leaving directory `$(@D)/xml2ag'
+Making check in doc
+make[1]: Entering directory `$(@D)/doc'
+/usr/gnu/bin/make  check-am
+make[2]: Entering directory `$(@D)/doc'
+make[2]: Nothing to be done for `check-am'.
+make[2]: Leaving directory `$(@D)/doc'
+make[1]: Leaving directory `$(@D)/doc'
+Making check in pkg
+make[1]: Entering directory `$(@D)/pkg'
+make[1]: Nothing to be done for `check'.
+make[1]: Leaving directory `$(@D)/pkg'
+make[1]: Entering directory `$(@D)'
+make[1]: Leaving directory `$(@D)'