Use printf_debug/verbose in so-info

[babeltrace.git] / tests / lib / test_so_info.c

diff --git a/tests/lib/test_so_info.c b/tests/lib/test_so_info.c
index db4f239e5424d9cae8370539c204119d6f56b170..4ef14ed6a398451e009f8674de9f60dfffb59445 100644 (file)
--- a/tests/lib/test_so_info.c
+++ b/tests/lib/test_so_info.c
@@ -41,11 +41,12 @@
 #define FUNC_FOO_TP_FILENAME "/efficios/libhello.c"
 #define FUNC_FOO_ADDR_ELF 0x4013ef
 #define FUNC_FOO_ADDR_DBG_LINK 0x40148e
-#define FUNC_FOO_NAME "foo"
+#define FUNC_FOO_NAME "foo+0xc3"
 #define FUNC_FOO_NAME_ELF "foo+0x24"
 #define BUILD_ID_LEN 20
 
-char *opt_debug_dir;
+char *opt_debug_info_dir;
+char *opt_debug_info_target_prefix;
 
 static
 void test_so_info_build_id(const char *data_dir)
@@ -64,7 +65,7 @@ void test_so_info_build_id(const char *data_dir)
 
        snprintf(path, PATH_MAX, "%s/%s", data_dir, SO_NAME_BUILD_ID);
 
-       so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ);
+       so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ, true);
        ok(so != NULL, "so_info_create succesful");
 
        /* Test setting build_id */
@@ -105,7 +106,7 @@ void test_so_info_debug_link(const char *data_dir)
 
        snprintf(path, PATH_MAX, "%s/%s", data_dir, SO_NAME_DEBUG_LINK);
 
-       so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ);
+       so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ, true);
        ok(so != NULL, "so_info_create succesful");
 
        /* Test setting debug link */
@@ -146,7 +147,7 @@ void test_so_info_elf(const char *data_dir)
 
        snprintf(path, PATH_MAX, "%s/%s", data_dir, SO_NAME_ELF);
 
-       so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ);
+       so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ, true);
        ok(so != NULL, "so_info_create succesful");
 
        /* Test function name lookup (with ELF) */
@@ -183,7 +184,7 @@ void test_so_info(const char *data_dir)
 
        snprintf(path, PATH_MAX, "%s/%s", data_dir, SO_NAME);
 
-       so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ);
+       so = so_info_create(path, SO_LOW_ADDR, SO_MEMSZ, true);
        ok(so != NULL, "so_info_create succesful");
 
        /* Test so_info_has_address */
@@ -249,16 +250,16 @@ int main(int argc, char **argv)
        if (argc != 2) {
                return EXIT_FAILURE;
        } else {
-               opt_debug_dir = argv[1];
+               opt_debug_info_dir = argv[1];
        }
 
        ret = so_info_init();
        ok(ret == 0, "so_info_init succesful");
 
-       test_so_info(opt_debug_dir);
-       test_so_info_elf(opt_debug_dir);
-       test_so_info_build_id(opt_debug_dir);
-       test_so_info_debug_link(opt_debug_dir);
+       test_so_info(opt_debug_info_dir);
+       test_so_info_elf(opt_debug_info_dir);
+       test_so_info_build_id(opt_debug_info_dir);
+       test_so_info_debug_link(opt_debug_info_dir);
 
        return EXIT_SUCCESS;
 }