Changeset 3fddb55 in mainline

Timestamp:

2011-03-30T13:20:37Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

fc8c2b6

Parents:

0876062

Message:

Testing driver improvement

The driver tries to register the same function twice and checks that
such operation fails with appropriate error code.

File:

• uspace/drv/test1/test1.c (modified) (4 diffs)

uspace/drv/test1/test1.c

@@ -58 +58 @@
  */
 static int register_fun_verbose(ddf_dev_t *parent, const char *message,
-    const char *name, const char *match_id, int match_score)
+    const char *name, const char *match_id, int match_score,
+    int expected_rc)
 {
-        ddf_fun_t *fun;
+        ddf_fun_t *fun = NULL;
         int rc;
 
@@ -68 +69 @@
         if (fun == NULL) {
                 printf(NAME ": error creating function %s\n", name);
-                return ENOMEM;
+                rc = ENOMEM;
+                goto leave;
         }
 
-        rc = ddf_fun_add_match_id(fun, match_id, match_score);
+        rc = ddf_fun_add_match_id(fun, str_dup(match_id), match_score);
         if (rc != EOK) {
                 printf(NAME ": error adding match IDs to function %s\n", name);
-                ddf_fun_destroy(fun);
-                return rc;
+                goto leave;
         }
 
@@ -82 +83 @@
                 printf(NAME ": error binding function %s: %s\n", name,
                     str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
+                goto leave;
         }
 
         printf(NAME ": registered child device `%s'\n", name);
-        return EOK;
+        rc = EOK;
+
+
+leave:
+        if (rc != expected_rc) {
+                fprintf(stderr,
+                    NAME ": Unexpected error registering function `%s'.\n" \
+                    NAME ":     Expected \"%s\" but got \"%s\".\n",
+                    name, str_error(expected_rc), str_error(rc));
+        }
+
+        if ((rc != EOK) && (fun != NULL)) {
+                ddf_fun_destroy(fun);
+        }
+
+        return rc;
 }
 
@@ -133 +148 @@
                 ddf_fun_add_to_class(fun_a, "virt-null");
         } else if (str_cmp(dev->name, "test1") == 0) {
-                (void) register_fun_verbose(dev, "cloning myself ;-)", "clone",
-                    "virtual&test1", 10);
+                (void) register_fun_verbose(dev,
+                    "cloning myself ;-)", "clone",
+                    "virtual&test1", 10, EOK);
+                (void) register_fun_verbose(dev,
+                    "cloning myself twice ;-)", "clone",
+                    "virtual&test1", 10, EEXISTS);
         } else if (str_cmp(dev->name, "clone") == 0) {
-                (void) register_fun_verbose(dev, "run by the same task", "child",
-                    "virtual&test1&child", 10);
+                (void) register_fun_verbose(dev,
+                    "run by the same task", "child",
+                    "virtual&test1&child", 10, EOK);
         }