# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1435614875 25200
# Node ID b8f0fb772f16df03ffebfabd57ffe2a552ea2b13
# Parent  12e319bad8446d60bae76392357245524f5d19b3
21315323 Hookup system-tests for xmlto

diff -r 12e319bad844 -r b8f0fb772f16 components/xmlto/Makefile
--- a/components/xmlto/Makefile	Mon Jun 29 13:31:18 2015 -0700
+++ b/components/xmlto/Makefile	Mon Jun 29 14:54:35 2015 -0700
@@ -49,9 +49,24 @@
 
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
 
+# Strip compilation lines from test output
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|g" ' \
+	'-e "s|^.*source=.*libtool=no.*$$|XXX_CC_XXX|g" ' \
+	'-e "s|^.*DEPDIR=.deps.*$$|XXX_CC_XXX|g" ' \
+	'-e "s|^.*xmlif.l.*$$|XXX_CC_XXX|g" ' \
+	'-e "s|^make.*: Leaving directory.*$$|XXX_CC_XXX|g" ' \
+	'-e "s|^make.*: Entering directory.*$$|XXX_CC_XXX|g" ' \
+	'-e "/^XXX_CC_XXX$$/d" '
+
+COMPONENT_SYSTEM_TEST_ENV += top_srcdir=$(SOURCE_DIR)
+COMPONENT_SYSTEM_TEST_ENV += top_builddir=$(BUILD_DIR)
+COMPONENT_PRE_SYSTEM_TEST_ACTION += \
+	$(GSED) -i -e "s|^XMLIF=.*$$|XMLIF=/usr/bin/xmlif|" \
+	$(SOURCE_DIR)/xmlif/test/run-test
+
 ASLR_MODE = $(ASLR_ENABLE)
 
-# common targets
 configure:	$(CONFIGURE_64)
 
 build:		$(BUILD_64)
@@ -60,7 +75,7 @@
 
 test:		$(TEST_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:    configure $(SYSTEM_TEST_64)
 
 
 REQUIRED_PACKAGES += file/gnu-coreutils
diff -r 12e319bad844 -r b8f0fb772f16 components/xmlto/test/results-64.master
--- a/components/xmlto/test/results-64.master	Mon Jun 29 13:31:18 2015 -0700
+++ b/components/xmlto/test/results-64.master	Mon Jun 29 14:54:35 2015 -0700
@@ -1,9 +1,5 @@
-make[1]: Entering directory `$(@D)'
 /usr/gnu/bin/make  check-TESTS
-make[2]: Entering directory `$(@D)'
 PASS: xmlif/test/run-test
 =============
 1 test passed
 =============
-make[2]: Leaving directory `$(@D)'
-make[1]: Leaving directory `$(@D)'