--- a/components/lynx/Makefile	Mon Jan 26 08:39:42 2015 -0800
+++ b/components/lynx/Makefile	Mon Jan 26 08:43:27 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -51,6 +51,16 @@
 CONFIGURE_OPTIONS +=	--with-ssl
 CONFIGURE_OPTIONS +=	--with-screen=ncurses
 
+# Use the HTML and CSS styling external test suite as referenced at
+# http://www.w3.org/2005/MWI/Tests/
+COMPONENT_TEST_CMD = $(@D)/src/lynx
+COMPONENT_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_TEST_TARGETS =
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 configure:	$(CONFIGURE_64)
@@ -59,7 +69,7 @@
 
 install:	$(INSTALL_64)
 
-test:		$(NO_TESTS)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lynx/test/results-64.master	Mon Jan 26 08:43:27 2015 -0800
@@ -0,0 +1,169 @@
+                               Markup Test Page 1
+
+Typography
+     __________________________________________________________________
+
+                                   H1 Heading
+
+H2 Heading
+
+  H3 Heading
+
+    H4 Heading
+
+      H5 Heading
+
+        H6 Heading
+
+   This is a paragraph.
+
+     This is a blockquote.
+
+     This is a cite.
+
+   Strong <strong> and Bold <b>
+
+   Emphasis <em> and Italic <i>
+
+   This is a serif typeface.
+
+   This is a sans-serif typeface.
+
+   Font size 6px
+
+   Font size 8px
+
+   Font size 10px
+
+   Font size 11px
+
+   Font size 12px
+
+   Font size 14px
+
+   Font size 18px
+
+   Font size .5em
+
+   Font size .75em
+
+   Font size .9em
+
+   Font size 1em
+
+   Font size 1.5em
+
+   Font size 2em
+
+   [1]Back to home
+     __________________________________________________________________
+
+   � 2006 [2]Cameron Moll.
+
+References
+
+   1. http://www.cameronmoll.com/mobile/mkp/index.html
+   2. http://www.cameronmoll.com/
+
+                               Markup Test Page 2
+
+Lists
+     __________________________________________________________________
+
+     * This is an unordered list <ul>
+     * List item number two.
+
+    1. This is an ordered list <ol>
+    2. List item number two.
+    3. List item number three.
+
+    1. [1]Use keypad 1 to access this link
+    2. [2]Use keypad 2 to access this link
+    3. [3]Use keypad 3 to access this link
+
+   This is a term <dt>
+          This is the definition of that term.
+
+   [4]Back to home
+     __________________________________________________________________
+
+   � 2006 [5]Cameron Moll.
+
+References
+
+   1. http://www.yahoo.com/
+   2. http://www.bbc.co.uk/
+   3. http://mobile.msn.com/
+   4. http://www.cameronmoll.com/mobile/mkp/index.html
+   5. http://www.cameronmoll.com/
+
+                               Markup Test Page 3
+
+Images, Tables
+     __________________________________________________________________
+
+   Small image (120x60)
+
+   Medium image (250x60)
+
+   Large image (460x60)
+
+   CAPTION: Two-column table
+
+   Col 1 head Col 2 head
+   Col 1 data Col 2 data
+
+   [1]Back to home
+     __________________________________________________________________
+
+   � 2006 [2]Cameron Moll.
+
+References
+
+   1. http://www.cameronmoll.com/mobile/mkp/index.html
+   2. http://www.cameronmoll.com/
+
+                               Markup Test Page 4
+
+Advanced
+     __________________________________________________________________
+
+   Box with a solid border
+
+   Box with a dotted (...) border
+
+   Box with a dashed (- - -) border
+
+   Box with a double (=) border
+
+   Box with solid red background
+
+   Box with background image (slanted blue lines)
+
+   45% float left
+
+   45% float right
+
+   This is center-aligned text (text-align: center).
+
+   This is right-aligned text (text-align: right).
+
+   This is an ABBR.
+
+   This is an ACRONYM
+
+   This is code.
+
+   This is a [DEL: del :DEL] (strike-through).
+
+   Today's date generated with JavaScript: ( )
+
+   [1]Back to home
+     __________________________________________________________________
+
+   � 2005 [2]Cameron Moll.
+
+References
+
+   1. http://www.cameronmoll.com/mobile/mkp/index.html
+   2. http://www.cameronmoll.com/

--- a/components/w3m/Makefile	Mon Jan 26 08:39:42 2015 -0800
+++ b/components/w3m/Makefile	Mon Jan 26 08:43:27 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -51,6 +51,16 @@
 CONFIGURE_OPTIONS +=	--sysconfdir=$(ETCDIR)
 CONFIGURE_OPTIONS +=	--with-browser=/usr/bin/firefox
 
+# Use the HTML and CSS styling external test suite as referenced at
+# http://www.w3.org/2005/MWI/Tests/
+COMPONENT_TEST_CMD = $(@D)/w3m
+COMPONENT_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_TEST_TARGETS =
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 configure:	$(CONFIGURE_64)
@@ -59,7 +69,7 @@
 
 install:	$(INSTALL_64)
 
-test:		$(NO_TESTS)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/w3m/test/results-64.master	Mon Jan 26 08:43:27 2015 -0800
@@ -0,0 +1,161 @@
+Markup Test Page 1
+
+Typography
+
+-------------------------------------------------------------------------------
+
+H1 Heading
+
+H2 Heading
+
+H3 Heading
+
+H4 Heading
+
+H5 Heading
+
+H6 Heading
+
+This is a paragraph.
+
+    This is a blockquote.
+
+    This is a cite.
+
+Strong <strong> and Bold <b>
+
+Emphasis <em> and Italic <i>
+
+This is a serif typeface.
+
+This is a sans-serif typeface.
+
+Font size 6px
+
+Font size 8px
+
+Font size 10px
+
+Font size 11px
+
+Font size 12px
+
+Font size 14px
+
+Font size 18px
+
+Font size .5em
+
+Font size .75em
+
+Font size .9em
+
+Font size 1em
+
+Font size 1.5em
+
+Font size 2em
+
+Back to home
+
+-------------------------------------------------------------------------------
+
+(C) 2006 Cameron Moll.
+
+Markup Test Page 2
+
+Lists
+
+-------------------------------------------------------------------------------
+
+  * This is an unordered list <ul>
+  * List item number two.
+
+ 1. This is an ordered list <ol>
+ 2. List item number two.
+ 3. List item number three.
+
+ 1. Use keypad 1 to access this link
+ 2. Use keypad 2 to access this link
+ 3. Use keypad 3 to access this link
+
+This is a term <dt>
+    This is the definition of that term.
+
+Back to home
+
+-------------------------------------------------------------------------------
+
+(C) 2006 Cameron Moll.
+
+Markup Test Page 3
+
+Images, Tables
+
+-------------------------------------------------------------------------------
+
+Small image (120x60)
+[sm]
+
+Medium image (250x60)
+[md]
+
+Large image (460x60)
+[lg]
+
+   Two-column table
++---------------------+
+|Col 1 head|Col 2 head|
+|----------+----------|
+|Col 1 data|Col 2 data|
++---------------------+
+
+Back to home
+
+-------------------------------------------------------------------------------
+
+(C) 2006 Cameron Moll.
+
+Markup Test Page 4
+
+Advanced
+
+-------------------------------------------------------------------------------
+
+Box with a solid border
+
+Box with a dotted (...) border
+
+Box with a dashed (- - -) border
+
+Box with a double (=) border
+
+Box with solid red background
+
+Box with background image (slanted blue lines)
+
+45% float left
+
+45% float right
+
+
+This is center-aligned text (text-align: center).
+
+This is right-aligned text (text-align: right).
+
+This is an ABBR.
+
+This is an ACRONYM
+
+This is code.
+
+This is a [DEL:del:DEL] (strike-through).
+
+Today's date generated with JavaScript: ( )
+
+Back to home
+
+-------------------------------------------------------------------------------
+
+(C) 2005 Cameron Moll.
+