configure: allow adding compiler-specific warning flags

[babeltrace.git] / tests / plugins / flt.lttng-utils.debug-info / test_bin_info.c

diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c
index 6d29322498fa308114e240c87c2f7c6657df0464..35cacfad621c03531eb507f74c59430ec0015d4c 100644 (file)
--- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c
+++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c
@@ -90,14 +90,14 @@ static GOptionEntry entries[] = {
         "XXXXXXXXXXXXXXX"},
        {"debug-info-dir", 0, 0, G_OPTION_ARG_STRING, &opt_debug_info_dir,
         "Debug info directory", NULL},
-       {NULL}};
+       {NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL}};
 
 static
 int build_id_to_bin(void)
 {
        int ret, len, i;
 
-       if (opt_build_id == NULL) {
+       if (!opt_build_id) {
                goto error;
        }
 
@@ -151,7 +151,7 @@ void subtest_lookup_function_name(struct bin_info *bin, uint64_t addr,
        char *_func_name = NULL;
 
        ret = bin_info_lookup_function_name(bin, addr, &_func_name);
-       ok(ret == 0, "bin_info_lookup_function_name successful at 0x%x", addr);
+       ok(ret == 0, "bin_info_lookup_function_name successful at 0x%" PRIx64, addr);
        if (_func_name) {
                ok(strcmp(_func_name, func_name) == 0,
                   "bin_info_lookup_function_name - correct function name (%s == %s)",
@@ -165,24 +165,24 @@ void subtest_lookup_function_name(struct bin_info *bin, uint64_t addr,
 
        /* Test function name lookup - erroneous address */
        ret = bin_info_lookup_function_name(bin, SO_INV_ADDR, &_func_name);
-       ok(ret == -1 && _func_name == NULL,
+       ok(ret == -1 && !_func_name,
           "bin_info_lookup_function_name - fail on invalid addr");
        free(_func_name);
 }
 
 static
 void subtest_lookup_source_location(struct bin_info *bin, uint64_t addr,
-                                          uint64_t line_no, char *filename)
+                                          uint64_t line_no, const char *filename)
 {
        int ret;
        struct source_location *src_loc = NULL;
 
        ret = bin_info_lookup_source_location(bin, addr, &src_loc);
-       ok(ret == 0, "bin_info_lookup_source_location successful at 0x%x",
+       ok(ret == 0, "bin_info_lookup_source_location successful at 0x%" PRIx64,
           addr);
        if (src_loc) {
                ok(src_loc->line_no == line_no,
-                  "bin_info_lookup_source_location - correct line_no (%d == %d)",
+                  "bin_info_lookup_source_location - correct line_no (%" PRIu64 " == %" PRIu64 ")",
                   line_no, src_loc->line_no);
                ok(strcmp(src_loc->filename, filename) == 0,
                   "bin_info_lookup_source_location - correct filename (%s == %s)",
@@ -196,7 +196,7 @@ void subtest_lookup_source_location(struct bin_info *bin, uint64_t addr,
 
        /* Test source location lookup - erroneous address */
        ret = bin_info_lookup_source_location(bin, SO_INV_ADDR, &src_loc);
-       ok(ret == -1 && src_loc == NULL,
+       ok(ret == -1 && !src_loc,
           "bin_info_lookup_source_location - fail on invalid addr");
        if (src_loc) {
                source_location_destroy(src_loc);
@@ -221,7 +221,7 @@ void test_bin_info_build_id(const char *bin_info_dir)
        bin_path =
                g_build_filename(bin_info_dir, BUILDID_DIR_NAME, SO_NAME, NULL);
 
-       if (data_dir == NULL || bin_path == NULL) {
+       if (!data_dir || !bin_path) {
                exit(EXIT_FAILURE);
        }
 
@@ -233,7 +233,7 @@ void test_bin_info_build_id(const char *bin_info_dir)
 
        bin = bin_info_create(&fdc, bin_path, SO_LOW_ADDR, SO_MEMSZ, true,
                              data_dir, NULL, BT_LOG_OUTPUT_LEVEL, NULL);
-       ok(bin != NULL, "bin_info_create successful (%s)", bin_path);
+       ok(bin, "bin_info_create successful (%s)", bin_path);
 
        /* Test setting invalid build_id */
        ret = bin_info_set_build_id(bin, invalid_build_id, BUILD_ID_HEX_LEN);
@@ -275,7 +275,7 @@ void test_bin_info_debug_link(const char *bin_info_dir)
        bin_path = g_build_filename(bin_info_dir, DEBUGLINK_DIR_NAME, SO_NAME,
                                    NULL);
 
-       if (data_dir == NULL || bin_path == NULL) {
+       if (!data_dir || !bin_path) {
                exit(EXIT_FAILURE);
        }
 
@@ -287,7 +287,7 @@ void test_bin_info_debug_link(const char *bin_info_dir)
 
        bin = bin_info_create(&fdc, bin_path, SO_LOW_ADDR, SO_MEMSZ, true,
                data_dir, NULL, BT_LOG_OUTPUT_LEVEL, NULL);
-       ok(bin != NULL, "bin_info_create successful (%s)", bin_path);
+       ok(bin, "bin_info_create successful (%s)", bin_path);
 
        /* Test setting debug link */
        ret = bin_info_set_debug_link(bin, DEBUG_NAME, opt_debug_link_crc);
@@ -325,7 +325,7 @@ void test_bin_info_elf(const char *bin_info_dir)
        data_dir = g_build_filename(bin_info_dir, ELF_DIR_NAME, NULL);
        bin_path = g_build_filename(bin_info_dir, ELF_DIR_NAME, SO_NAME, NULL);
 
-       if (data_dir == NULL || bin_path == NULL) {
+       if (!data_dir || !bin_path) {
                exit(EXIT_FAILURE);
        }
 
@@ -337,7 +337,7 @@ void test_bin_info_elf(const char *bin_info_dir)
 
        bin = bin_info_create(&fdc, bin_path, SO_LOW_ADDR, SO_MEMSZ, true,
                data_dir, NULL, BT_LOG_OUTPUT_LEVEL, NULL);
-       ok(bin != NULL, "bin_info_create successful (%s)", bin_path);
+       ok(bin, "bin_info_create successful (%s)", bin_path);
 
        /* Test bin_info_has_address */
        subtest_has_address(bin, func_foo_printf_addr);
@@ -373,7 +373,7 @@ void test_bin_info_bundled(const char *bin_info_dir)
        bin_path =
                g_build_filename(bin_info_dir, DWARF_DIR_NAME, SO_NAME, NULL);
 
-       if (data_dir == NULL || bin_path == NULL) {
+       if (!data_dir || !bin_path) {
                exit(EXIT_FAILURE);
        }
 
@@ -385,7 +385,7 @@ void test_bin_info_bundled(const char *bin_info_dir)
 
        bin = bin_info_create(&fdc, bin_path, SO_LOW_ADDR, SO_MEMSZ, true,
                data_dir, NULL, BT_LOG_OUTPUT_LEVEL, NULL);
-       ok(bin != NULL, "bin_info_create successful (%s)", bin_path);
+       ok(bin, "bin_info_create successful (%s)", bin_path);
 
        /* Test bin_info_has_address */
        subtest_has_address(bin, func_foo_printf_addr);