Changeset 7c4b26c in mainline

Timestamp:

2016-05-02T21:30:14Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

91e4567

Parents:

32573ff

Message:

Dltest needs to test direct linking. Dltests to only test dlfcn. Need to dynamically link dltest even if using static base libs.

Files:

• .bzrignore (modified) (2 diffs)
• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (3 diffs)
• uspace/Makefile.common (modified) (2 diffs)
• uspace/app/dltest/Makefile (modified) (1 diff)
• uspace/app/dltest/dltest.c (modified) (3 diffs)
• uspace/app/dltests/Makefile (added)
• uspace/app/dltests/dltests.c (added)

.bzrignore

@@ -35 +35 @@
 uspace/app/devctl/devctl
 uspace/app/dltest/dltest
+uspace/app/dltests/dltests
 uspace/app/dnscfg/dnscfg
 uspace/app/dnsres/dnsres
@@ -96 +97 @@
 uspace/dist/app/devctl
 uspace/dist/app/dltest
+uspace/dist/app/dltests
 uspace/dist/app/dnscfg
 uspace/dist/app/dnsres

boot/Makefile.common

@@ -226 +226 @@
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
         RD_APPS_NON_ESSENTIAL += \
-                $(USPACE_PATH)/app/dltest/dltest
+                $(USPACE_PATH)/app/dltest/dltest \
+                $(USPACE_PATH)/app/dltests/dltests
 endif
 

uspace/Makefile

@@ -41 +41 @@
         app/corecfg \
         app/devctl \
-        app/dltest \
         app/dnscfg \
         app/dnsres \
@@ -166 +165 @@
         drv/platform/icp
 
+
 ## Platform-specific hardware support
 #
@@ -209 +209 @@
                 drv/fb/amdm37x_dispc \
                 srv/hw/irc/icp-ic
+endif
+
+## Dynamic linking tests
+#
+ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
+        DIRS += \
+                app/dltest \
+                app/dltests
 endif
 

uspace/Makefile.common

@@ -199 +199 @@
 ifeq ($(STATIC_BUILD),y)
         BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
-        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
         ifeq ($(MATH),y)
                 BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
@@ -205 +204 @@
 else
         BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
-        LFLAGS += -Bdynamic
-        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
+        LINK_DYNAMIC = y
         ifeq ($(MATH),y)
                 BASE_LIBS += $(LIBMATH_PREFIX)/libmath.so.0
         endif
+endif
+
+ifeq ($(LINK_DYNAMIC),y)
+        LFLAGS += -Bdynamic
+        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
+else
+        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
 endif
 

uspace/app/dltest/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../..
-EXTRA_CFLAGS = -I$(LIBDLTEST_PREFIX)
+EXTRA_CFLAGS = -I$(LIBDLTEST_PREFIX) -DDLTEST_LINKED
+LIBS = $(LIBDLTEST_PREFIX)/libdltest.so.0.0
+# Need a dynamic link, but possibly still use static libc
+LINK_DYNAMIC = y
+
 BINARY = dltest
 

uspace/app/dltest/dltest.c

@@ -45 +45 @@
 void *handle;
 
+
 /** Test dlsym() function */
 static bool test_dlsym(void)
@@ -255 +256 @@
 }
 
+#ifdef DLTEST_LINKED
+
+/** Test directly calling function that returns a constant */
+static bool test_lnk_dl_get_constant(void)
+{
+        int val;
+
+        printf("Call linked dl_get_constant...\n");
+
+        val = 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 dircetly calling a function that returns contents of a private
+ * initialized variable.
+ */
+static bool test_lnk_dl_get_private_var(void)
+{
+        int val;
+
+        printf("Call linked dl_get_private_var...\n");
+
+        val = dl_get_private_var();
+
+        printf("Got %d, expected %d... ", val, dl_private_var_val);
+        if (val != dl_private_var_val) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
+/** Test dircetly calling a function that returns contents of a private
+ * uninitialized variable.
+ */
+static bool test_lnk_dl_get_private_uvar(void)
+{
+        int val;
+
+        printf("Call linked dl_get_private_uvar...\n");
+
+        val = dl_get_private_uvar();
+
+        printf("Got %d, expected %d... ", val, 0);
+        if (val != 0) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
+/** Test directly calling a function that returns the contents of a public
+ * initialized variable.
+ */
+static bool test_lnk_dl_get_public_var(void)
+{
+        int val;
+
+        printf("Call linked dl_get_public_var...\n");
+
+        val = dl_get_public_var();
+
+        printf("Got %d, expected %d... ", val, dl_public_var_val);
+        if (val != dl_public_var_val) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
+/** Test directly calling a function that returns the contents of a public
+ * uninitialized variable.
+ */
+static bool test_lnk_dl_get_public_uvar(void)
+{
+        int val;
+
+        printf("Call linked dl_get_public_uvar...\n");
+
+        val = dl_get_public_uvar();
+
+        printf("Got %d, expected %d... ", val, 0);
+        if (val != 0) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
+/** Test directly reading a public initialized variable. */
+static bool test_lnk_read_public_var(void)
+{
+        int val;
+
+        printf("Read linked dl_public_var...\n");
+
+        val = dl_public_var;
+
+        printf("Got %d, expected %d... ", val, dl_public_var_val);
+        if (val != dl_public_var_val) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
+/** Test directly reading a public uninitialized variable. */
+static bool test_lnk_read_public_uvar(void)
+{
+        int val;
+
+        printf("Read linked dl_public_uvar...\n");
+
+        val = dl_public_uvar;
+
+        printf("Got %d, expected %d... ", val, 0);
+        if (val != 0) {
+                printf("FAILED\n");
+                return false;
+        }
+
+        printf("Passed\n");
+        return true;
+}
+
+#endif
+
 int main(int argc, char *argv[])
 {
@@ -293 +439 @@
                 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;
+#endif
 //      printf("dlclose()... ");
 //      dlclose(handle);