Changeset 29405ac in mainline for uspace/app/dltest/dltest.c

Timestamp:

2016-05-16T18:10:00Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bab0f42

Parents:

0dc9a474

Message:

DTPMOD relocations with null symbol name should return the current module index. Implement TPOFF relocations. dltest -n to not run dlfcn tests. Now dltest -n works like a charm. Place TLS images in descending order for variant II just to be safe. Propagate TLS alignment info.

File:

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

uspace/app/dltest/dltest.c

@@ -43 +43 @@
 
 /** libdltest library handle */
-void *handle;
-
+static void *handle;
+
+/** If true, do not run dlfcn tests */
+static bool no_dlfcn = false;
 
 /** Test dlsym() function */
@@ -691 +693 @@
 #endif
 
-int main(int argc, char *argv[])
-{
-
-        printf("Dynamic linking test\n");
-
+static int test_dlfcn(void)
+{
         printf("dlopen()... ");
         handle = dlopen("libdltest.so.0", 0);
@@ -747 +746 @@
                 return 1;
 
-#ifdef DLTEST_LINKED
-        if (!test_lnk_dl_get_constant())
-                return 1;
-
-        if (!test_lnk_dl_get_private_var())
-                return 1;
-
-        if (!test_lnk_dl_get_private_uvar())
-                return 1;
-
-        if (!test_lnk_dl_get_public_var())
-                return 1;
-
-        if (!test_lnk_dl_get_public_uvar())
-                return 1;
-
-        if (!test_lnk_read_public_var())
-                return 1;
-
-        if (!test_lnk_read_public_uvar())
-                return 1;
-
-        if (!test_lnk_dl_get_private_fib_var())
-                return 1;
-
-        if (!test_lnk_dl_get_private_fib_uvar())
-                return 1;
-
-        if (!test_lnk_dl_get_public_fib_var())
-                return 1;
-
-        if (!test_lnk_dl_get_public_fib_uvar())
-                return 1;
-
-        if (!test_lnk_read_public_fib_var())
-                return 1;
-
-        if (!test_lnk_read_public_fib_uvar())
-                return 1;
-#endif
 //      printf("dlclose()... ");
 //      dlclose(handle);
 //      printf("Passed\n");
 
+        return 0;
+}
+
+#ifdef DLTEST_LINKED
+
+static int test_lnk(void)
+{
+        if (!test_lnk_dl_get_constant())
+                return 1;
+
+        if (!test_lnk_dl_get_private_var())
+                return 1;
+
+        if (!test_lnk_dl_get_private_uvar())
+                return 1;
+
+        if (!test_lnk_dl_get_public_var())
+                return 1;
+
+        if (!test_lnk_dl_get_public_uvar())
+                return 1;
+
+        if (!test_lnk_read_public_var())
+                return 1;
+
+        if (!test_lnk_read_public_uvar())
+                return 1;
+
+        if (!test_lnk_dl_get_private_fib_var())
+                return 1;
+
+        if (!test_lnk_dl_get_private_fib_uvar())
+                return 1;
+
+        if (!test_lnk_dl_get_public_fib_var())
+                return 1;
+
+        if (!test_lnk_dl_get_public_fib_uvar())
+                return 1;
+
+        if (!test_lnk_read_public_fib_var())
+                return 1;
+
+        if (!test_lnk_read_public_fib_uvar())
+                return 1;
+
+        return 0;
+}
+
+#endif
+
+static void print_syntax(void)
+{
+        fprintf(stderr, "syntax: dltest [-n]\n");
+        fprintf(stderr, "\t-n Do not run dlfcn tests\n");
+}
+
+int main(int argc, char *argv[])
+{
+        printf("Dynamic linking test\n");
+
+        if (argc > 1) {
+                if (argc > 2) {
+                        print_syntax();
+                        return 1;
+                }
+
+                if (str_cmp(argv[1], "-n") == 0) {
+                        no_dlfcn = true;
+                } else {
+                        print_syntax();
+                        return 1;
+                }
+        }
+
+        if (!no_dlfcn) {
+                if (test_dlfcn() != 0)
+                        return 1;
+        }
+
+#ifdef DLTEST_LINKED
+        if (test_lnk() != 0)
+                return 1;
+#endif
+
         printf("All passed.\n");
         return 0;