Changeset ab936440 in mainline for uspace/app/dltest/dltest.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/app/dltest/dltest.c (modified) (4 diffs)

uspace/app/dltest/dltest.c

@@ -91 +91 @@
 }
 
+/** Test calling function that calls a function that returns a constant */
+static bool test_dlfcn_dl_get_constant_via_call(void)
+{
+        int (*p_dl_get_constant)(void);
+        int val;
+
+        printf("Call dlsym/dl_get_constant_via_call...\n");
+
+        p_dl_get_constant = dlsym(handle, "dl_get_constant_via_call");
+        if (p_dl_get_constant == NULL) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        val = p_dl_get_constant();
+
+        printf("Got %d, expected %d... ", val, dl_constant);
+        if (val != dl_constant) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
 /** Test calling a function that returns contents of a private initialized
  * variable.
@@ -564 +590 @@
 }
 
+/** Test directly calling function that calls a function that returns a constant */
+static bool test_lnk_dl_get_constant_via_call(void)
+{
+        int val;
+
+        printf("Call linked dl_get_constant_via_call...\n");
+
+        val = dl_get_constant_via_call();
+
+        printf("Got %d, expected %d... ", val, dl_constant);
+        if (val != dl_constant) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
 /** Test dircetly calling a function that returns contents of a private
  * initialized variable.
@@ -853 +898 @@
                 return 1;
 
+        if (!test_dlfcn_dl_get_constant_via_call())
+                return 1;
+
         if (!test_dlfcn_dl_get_private_var())
                 return 1;
@@ -905 +953 @@
 {
         if (!test_lnk_dl_get_constant())
+                return 1;
+
+        if (!test_lnk_dl_get_constant_via_call())
                 return 1;