Changeset 49d819b4 in mainline for uspace/app

Timestamp:

2010-11-02T23:15:18Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7ae3d6f

Parents:

e06ef614 (diff), d0d1f4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/net.

Location:

uspace/app/netstart

Files:

• Makefile (moved) (moved from uspace/srv/net/netstart/Makefile ) (2 diffs)
• netstart.c (moved) (moved from uspace/srv/net/netstart/netstart.c ) (3 diffs)
• self_test.c (moved) (moved from uspace/srv/net/netstart/self_test.c )
• self_test.h (moved) (moved from uspace/srv/net/netstart/self_test.h )

uspace/app/netstart/Makefile

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../../..
+USPACE_PREFIX = ../..
 LIBS = $(LIBNET_PREFIX)/libnet.a
 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
@@ -35 +35 @@
 
 SOURCES = \
-        netstart.c \
-        self_test.c
+        netstart.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/netstart/netstart.c

@@ -32 +32 @@
 
 /** @file
- *
  * Start the networking subsystem.
- * Perform networking self-test if executed
- * with the -s argument.
- *
  */
 
@@ -52 +48 @@
 #include <net/modules.h>
 
-#include "self_test.h"
-
 /** Start a module.
  *
- * @param[in] desc The module description
- * @param[in] path The module absolute path.
- *
- * @returns true on succesful spanwning
- * @returns false on failure
- *
+ * @param[in] desc      The module description
+ * @param[in] path      The module absolute path.
+ * @returns             True on succesful spanwning.
+ * @returns             False on failure
  */
 static bool spawn(const char *desc, const char *path)
@@ -86 +78 @@
         ERROR_DECLARE;
         
-        /* Run self-tests */
-        if ((argc > 1) && (str_cmp(argv[1], "-s") == 0))
-                ERROR_PROPAGATE(self_test());
-        
         if (!spawn("networking service", "/srv/net"))
                 return EINVAL;