20974465 Two "gmake system-test" infrastructure fixes plus 3 components with system tests
authorRich Burridge <rich.burridge@oracle.com>
Tue, 28 Apr 2015 12:08:14 -0700
changeset 4206 a24a2855075c
parent 4205 ac5d1eac6100
child 4209 107a604ac200
20974465 Two "gmake system-test" infrastructure fixes plus 3 components with system tests
components/aalib/Makefile
components/lynx/Makefile
components/w3m/Makefile
make-rules/shared-macros.mk
--- a/components/aalib/Makefile	Tue Apr 28 11:31:38 2015 -0700
+++ b/components/aalib/Makefile	Tue Apr 28 12:08:14 2015 -0700
@@ -69,6 +69,11 @@
 COMPONENT_TEST_ARGS =	-kbddriver stdin -driver stdout
 COMPONENT_TEST_TARGETS =
 
+COMPONENT_SYSTEM_TEST_DIR =	$(SOURCE_DIR)/src
+COMPONENT_SYSTEM_TEST_CMD =	perl -E 'say "\n" x 40' | /usr/demo/aalib/aatest
+COMPONENT_SYSTEM_TEST_ARGS =	-kbddriver stdin -driver stdout
+COMPONENT_SYSTEM_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
@@ -83,6 +88,7 @@
 install:	$(INSTALL_32_and_64)
 
 test:		$(TEST_32_and_64)
+system-test:	$(SYSTEM_TEST_32_and_64)
 
 
 REQUIRED_PACKAGES += library/slang
--- a/components/lynx/Makefile	Tue Apr 28 11:31:38 2015 -0700
+++ b/components/lynx/Makefile	Tue Apr 28 12:08:14 2015 -0700
@@ -61,6 +61,15 @@
 	http://www.cameronmoll.com/mobile/mkp/pg4.html
 COMPONENT_TEST_TARGETS =
 
+COMPONENT_SYSTEM_TEST_DIR =
+COMPONENT_SYSTEM_TEST_CMD =		/usr/bin/lynx
+COMPONENT_SYSTEM_TEST_ARGS =		-dump \
+	http://www.cameronmoll.com/mobile/mkp/pg1.html \
+	http://www.cameronmoll.com/mobile/mkp/pg2.html \
+	http://www.cameronmoll.com/mobile/mkp/pg3.html \
+	http://www.cameronmoll.com/mobile/mkp/pg4.html
+COMPONENT_SYSTEM_TEST_TARGETS =
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 configure:	$(CONFIGURE_64)
@@ -70,6 +79,7 @@
 install:	$(INSTALL_64)
 
 test:		$(TEST_64)
+system-test:	$(SYSTEM_TEST_64)
 
 REQUIRED_PACKAGES += library/libidn
 REQUIRED_PACKAGES += library/ncurses
--- a/components/w3m/Makefile	Tue Apr 28 11:31:38 2015 -0700
+++ b/components/w3m/Makefile	Tue Apr 28 12:08:14 2015 -0700
@@ -62,6 +62,15 @@
 	http://www.cameronmoll.com/mobile/mkp/pg4.html
 COMPONENT_TEST_TARGETS =
 
+COMPONENT_SYSTEM_TEST_DIR =
+COMPONENT_SYSTEM_TEST_CMD =		/usr/bin/w3m
+COMPONENT_SYSTEM_TEST_ARGS =		-dump \
+	http://www.cameronmoll.com/mobile/mkp/pg1.html \
+	http://www.cameronmoll.com/mobile/mkp/pg2.html \
+	http://www.cameronmoll.com/mobile/mkp/pg3.html \
+	http://www.cameronmoll.com/mobile/mkp/pg4.html
+COMPONENT_SYSTEM_TEST_TARGETS =
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 configure:	$(CONFIGURE_64)
@@ -71,6 +80,7 @@
 install:	$(INSTALL_64)
 
 test:		$(TEST_64)
+system-test:	$(SYSTEM_TEST_64)
 
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
 REQUIRED_PACKAGES += library/gc
--- a/make-rules/shared-macros.mk	Tue Apr 28 11:31:38 2015 -0700
+++ b/make-rules/shared-macros.mk	Tue Apr 28 12:08:14 2015 -0700
@@ -345,7 +345,7 @@
 SYSTEM_TEST_32 =		$(BUILD_DIR_32)/.system-tested-and-compared
 SYSTEM_TEST_64 =		$(BUILD_DIR_64)/.system-tested-and-compared
 endif
-SYSTEM_TEST_32_and_64 =	$(TEST_32) $(TEST_64)
+SYSTEM_TEST_32_and_64 =	$(SYSTEM_TEST_32) $(SYSTEM_TEST_64)
 ifeq ($(strip $(wildcard $(COMPONENT_TEST_RESULTS_DIR)/results-*.master)),)
 TEST_NO_ARCH =		$(BUILD_DIR_NO_ARCH)/.tested
 TEST_32 =		$(BUILD_DIR_32)/.tested
@@ -379,6 +379,15 @@
 $(BUILD_DIR_32)/.tested-and-compared:			BITS=32
 $(BUILD_DIR_64)/.tested-and-compared:			BITS=64
 
+$(BUILD_DIR_NO_ARCH)/.system-tested:			$(BUILD_DIR_32)
+$(BUILD_DIR_32)/.system-tested:				$(BUILD_DIR_32)
+$(BUILD_DIR_64)/.system-tested:				$(BUILD_DIR_64)
+$(BUILD_DIR_NO_ARCH)/.system-tested-and-compared:	$(BUILD_DIR_32)
+$(BUILD_DIR_32)/.system-tested-and-compared:		$(BUILD_DIR_32)
+$(BUILD_DIR_64)/.system-tested-and-compared:		$(BUILD_DIR_64)
+
+$(BUILD_DIR_32) $(BUILD_DIR_64):
+	$(MKDIR) $(@)
 
 # BUILD_TOOLS is the root of all tools not normally installed on the system.
 BUILD_TOOLS ?=	/ws/on12-tools