21349149 Hookup system-tests for quilt
authorRich Burridge <rich.burridge@oracle.com>
Tue, 30 Jun 2015 12:47:06 -0700
changeset 4573 64ad0d7d3334
parent 4567 921fa080154a
child 4574 7ddafe81d631
21349149 Hookup system-tests for quilt
components/quilt/Makefile
components/quilt/test/results-64.master
--- a/components/quilt/Makefile	Tue Jun 30 17:10:26 2015 +0100
+++ b/components/quilt/Makefile	Tue Jun 30 12:47:06 2015 -0700
@@ -73,6 +73,18 @@
 
 COMPONENT_INSTALL_ARGS +=	BUILD_ROOT=$(PROTO_DIR)
 
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "s|^.* -> .*$$|XXX_REMOVE_XXX|g" ' \
+	'-e "s|^Generating.*$$|XXX_REMOVE_XXX|g" ' \
+	'-e "s|^make.*: Leaving directory.*$$|XXX_REMOVE_XXX|g" ' \
+	'-e "s|^make.*: Entering directory.*$$|XXX_REMOVE_XXX|g" ' \
+	'-e "/^XXX_REMOVE_XXX$$/d" '
+
+COMPONENT_PRE_SYSTEM_TEST_ACTION += \
+	$(GSED) -e "s|^PATH.*$$|PATH := /usr/gnu/bin:/usr/bin|" \
+	$(BUILD_DIR_64)/Makefile > $(BUILD_DIR_64)/Makefile-system-test
+COMPONENT_SYSTEM_TEST_ARGS = -f $(BUILD_DIR_64)/Makefile-system-test
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 configure:	$(CONFIGURE_64)
@@ -83,7 +95,7 @@
 
 test:		$(TEST_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:    configure $(SYSTEM_TEST_64)
 
 
 REQUIRED_PACKAGES += archiver/gnu-tar
--- a/components/quilt/test/results-64.master	Tue Jun 30 17:10:26 2015 +0100
+++ b/components/quilt/test/results-64.master	Tue Jun 30 12:47:06 2015 -0700
@@ -1,6 +1,3 @@
-make[1]: Entering directory `$(@D)'
-make[1]: Leaving directory `$(@D)'
-make[1]: Entering directory `$(@D)'
 [add-filename-check.test]
 6 commands (6 passed, 0 failed)
 [altered-series.test]
@@ -113,4 +110,3 @@
 21 commands (21 passed, 0 failed)
 [two.test]
 57 commands (57 passed, 0 failed)
-make[1]: Leaving directory `$(@D)'