# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1439567528 25200
# Node ID 3eeb991f0795f207f8c5fab304e58557a84706c4
# Parent  dbddfc4fa8f113e59cb416819bfe1d47bd218a3f
21634797 autogen should hookup its system-test target.

diff -r dbddfc4fa8f1 -r 3eeb991f0795 components/autogen/Makefile
--- a/components/autogen/Makefile	Thu Aug 13 09:08:19 2015 -0700
+++ b/components/autogen/Makefile	Fri Aug 14 08:52:08 2015 -0700
@@ -67,9 +67,19 @@
 # here, rather than create multiple identical master files.
 COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 
+COMPONENT_TEST_TRANSFORMS += \
+	'-n ' \
+	'-e "/SKIP/p" ' \
+	'-e "/PASS/p" ' \
+	'-e "/FAIL/p" ' \
+	'-e "/passed/p" '
+
+COMPONENT_SYSTEM_TEST_ENV +=	CLexe=/usr/bin/columns
+COMPONENT_SYSTEM_TEST_ENV +=	GDexe=/usr/bin/getdefs
+COMPONENT_SYSTEM_TEST_ENV +=	AGexe=/usr/bin/autogen
+
 ASLR_MODE = $(ASLR_ENABLE)
 
-# common targets
 configure:	$(CONFIGURE_32_and_64)
 
 build:		$(BUILD_32_and_64)
@@ -78,7 +88,8 @@
 
 test:		$(TEST_32_and_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+# Tests need to be built.
+system-test:	build $(SYSTEM_TEST_32_and_64)
 
 
 REQUIRED_PACKAGES += library/gmp
diff -r dbddfc4fa8f1 -r 3eeb991f0795 components/autogen/patches/system-test.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/autogen/patches/system-test.patch	Fri Aug 14 08:52:08 2015 -0700
@@ -0,0 +1,42 @@
+Patch to allow us to specify alternate autogen, columns and getdefs binaries
+when running tests.
+
+This patch has been sent upstream.
+
+--- autogen-5.16.2/agen5/bootstrap.dir.orig	2015-08-11 09:49:20.142168670 -0700
++++ autogen-5.16.2/agen5/bootstrap.dir	2015-08-11 09:51:33.172606217 -0700
+@@ -40,9 +40,9 @@
+ {
+     builddir=$(pwd)
+     srcdir=${srcdir:-$builddir}
+-    AGexe=$(command -v autogen)
+-    CLexe=$(command -v columns)
+-    GDexe=$(command -v getdefs)
++    AGexe=${AGexe:-$(command -v autogen)}
++    CLexe=${CLexe:-$(command -v columns)}
++    GDexe=${GDexe:-$(command -v getdefs)}
+ 
+     test -x "${AGexe}" -a -x "${GDexe}" -a -x "${CLexe}" || \
+         die "autogen is required"
+--- autogen-5.16.2/config/bootstrap.orig	2015-08-11 09:52:09.296125796 -0700
++++ autogen-5.16.2/config/bootstrap	2015-08-11 09:53:13.481511016 -0700
+@@ -72,7 +72,7 @@
+ 
+     #  Check for AutoGen version 5.
+     #
+-    AGexe=$(command -v autogen)
++    AGexe=${AGexe:-$(command -v autogen)}
+     case "${AGexe}" in
+     ( /* )
+         v=$($AGexe --version || :)
+@@ -87,8 +87,8 @@
+         ;;
+     esac
+ 
+-    GDexe=$(command -v getdefs)
+-    CLexe=$(command -v columns)
++    GDexe=${GDexe:-$(command -v getdefs)}
++    CLexe=${CLexe:-$(command -v columns)}
+     test -x "${GDexe}" -a -x "${CLexe}" || \
+         die "autogen support programs are missing"
+     export AGexe GDexe CLexe
diff -r dbddfc4fa8f1 -r 3eeb991f0795 components/autogen/test/results-all.master
--- a/components/autogen/test/results-all.master	Thu Aug 13 09:08:19 2015 -0700
+++ b/components/autogen/test/results-all.master	Fri Aug 14 08:52:08 2015 -0700
@@ -1,17 +1,3 @@
-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
@@ -36,26 +22,7 @@
 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=/s@".*"@"$(SOURCE_DIR)/agen5/test"@' -e '/^ *top_srcdir=/s@".*"@"$(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
@@ -97,78 +64,11 @@
 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)'