changeset 554:885dc4632462

* cdl/net.cdl (CYGPKG_NET_BUILD_HW_TESTS): Requires eth hardware devices. (CYGPKG_NET_TESTS): Remove from under CYGPKG_NET_BUILD_TESTS (which became CYGPKG_NET_BUILD_HW_TESTS) so the loopback tests are always built.
author jlarmour
date Fri, 31 Jan 2003 12:35:07 +0000
parents 489b846deeff
children ed761349f500
files packages/net/common/current/ChangeLog packages/net/common/current/cdl/net.cdl
diffstat 2 files changed, 30 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/packages/net/common/current/ChangeLog
+++ b/packages/net/common/current/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-31  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* cdl/net.cdl (CYGPKG_NET_BUILD_HW_TESTS): Requires eth hardware
+	devices.
+	(CYGPKG_NET_TESTS): Remove from under CYGPKG_NET_BUILD_TESTS (which
+	became CYGPKG_NET_BUILD_HW_TESTS) so the loopback tests are always
+	built.
+
 2003-01-20  Gary Thomas  <gary@mlbassoc.com>
 
 	* tests/nc_test_slave.c: Improve handling of UDP buffer space - try
--- a/packages/net/common/current/cdl/net.cdl
+++ b/packages/net/common/current/cdl/net.cdl
@@ -317,20 +317,31 @@ cdl_package CYGPKG_NET {
     }
 
     cdl_component CYGPKG_NET_BUILD_TESTS {
-        display "Build networking tests (demo programs)"
-        flavor  bool
+        display "Testing options"
+        flavor  none
         no_define
-        default_value 0
-        description   "
-        This option enables the building of additional network tests
-        which at this time are just demos; otherwise only loopback
-        interface tests will be built."
+        description "
+                This component contains options related to testing the network
+                stack."
+
+        cdl_option CYGPKG_NET_BUILD_HW_TESTS {
+            display "Build hardware networking tests (demo programs)"
+            flavor  bool
+            no_define
+            requires { CYGHWR_NET_DRIVER_ETH0_SETUP || CYGHWR_NET_DRIVER_ETH1_SETUP }
+            default_value 0
+            description   "
+             This option enables the building of additional network tests
+             that use real ethernet devices. At this time these are just
+             demos. With this option disabled, only loopback
+             interface tests will be built."
+        }
 
         cdl_option CYGPKG_NET_TESTS {
             display "Networking tests"
             flavor  data
             no_define
-            calculated { CYGPKG_NET_BUILD_TESTS ? \
+            calculated { CYGPKG_NET_BUILD_HW_TESTS ? \
                     "tests/mbuf_test \
                     tests/socket_test \
                     tests/ftp_test \
@@ -356,10 +367,10 @@ cdl_package CYGPKG_NET {
                     tests/udp_lo_test \
                     tests/multi_lo_select \
                     tests/tcp_lo_select"
-        }
+            }
             description   "
-            This option specifies the set of tests
-            for the networking package."
+             This option specifies the set of tests
+             for the networking package."
         }
         
         cdl_option CYGPKG_NET_TESTS_USE_RT_TEST_HARNESS {