Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cover code-id from ELF section with test case #776

Merged
merged 6 commits into from
Dec 9, 2022
Merged

Cover code-id from ELF section with test case #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c34dcb
Add test-case for code-id from section fallback in linux modulefinder
supervacuus Dec 7, 2022
748b66f
clang-format changes after updating to version 15
supervacuus Dec 7, 2022
b0f1e6a
Revert "clang-format changes after updating to version 15"
supervacuus Dec 7, 2022
371c906
Refactor tests towards input/expected configuration
supervacuus Dec 8, 2022
02e9375
Update test.inc
supervacuus Dec 8, 2022
3ea703c
Add #ifdef to compile test-helper only on Linux
supervacuus Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added tests/fixtures/without-buildid-phdr.so
View file
Open in desktop
Binary file not shown.
102 changes: 42 additions & 60 deletions tests/unit/test_modulefinder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,11 @@ SENTRY_TEST(procmaps_parser)
#endif
}

SENTRY_TEST(buildid_fallback)
#ifdef SENTRY_PLATFORM_LINUX
static void
parse_elf_and_check_code_and_build_id(const char *rel_elf_path,
const char *expected_code_id, const char *expected_debug_id)
{
// skipping this on android because it does not have access to the fixtures
#if !defined(SENTRY_PLATFORM_LINUX) || defined(SENTRY_PLATFORM_ANDROID)
SKIP_TEST();
#else
sentry_path_t *path = sentry__path_from_str(__FILE__);
sentry_path_t *dir = sentry__path_dir(path);
sentry__path_free(path);
Expand All @@ -135,72 +134,55 @@ SENTRY_TEST(buildid_fallback)
size_t *file_size = &module.mappings[0].size;
char **buf = (char **)&module.mappings[0].addr;

sentry_value_t with_id_val = sentry_value_new_object();
sentry_path_t *with_id_path
= sentry__path_join_str(dir, "../fixtures/with-buildid.so");
*buf = sentry__path_read_to_buffer(with_id_path, file_size);
sentry__path_free(with_id_path);
sentry_value_t value = sentry_value_new_object();
sentry_path_t *elf_path = sentry__path_join_str(dir, rel_elf_path);
*buf = sentry__path_read_to_buffer(elf_path, file_size);
sentry__path_free(elf_path);

TEST_CHECK(sentry__procmaps_read_ids_from_elf(with_id_val, &module));
TEST_CHECK(sentry__procmaps_read_ids_from_elf(value, &module));
sentry_free(*buf);
sentry__path_free(dir);

TEST_CHECK_STRING_EQUAL(
sentry_value_as_string(sentry_value_get_by_key(with_id_val, "code_id")),
"1c304742f114215453a8a777f6cdb3a2b8505e11");
TEST_CHECK_STRING_EQUAL(sentry_value_as_string(sentry_value_get_by_key(
with_id_val, "debug_id")),
"4247301c-14f1-5421-53a8-a777f6cdb3a2");
sentry_value_decref(with_id_val);

sentry_value_t x86_exe_val = sentry_value_new_object();
sentry_path_t *x86_exe_path
= sentry__path_join_str(dir, "../fixtures/sentry_example");
*buf = sentry__path_read_to_buffer(x86_exe_path, file_size);
sentry__path_free(x86_exe_path);

TEST_CHECK(sentry__procmaps_read_ids_from_elf(x86_exe_val, &module));
sentry_free(*buf);
if (expected_code_id) {
TEST_CHECK_STRING_EQUAL(
sentry_value_as_string(sentry_value_get_by_key(value, "code_id")),
expected_code_id);
} else {
TEST_CHECK(
sentry_value_is_null(sentry_value_get_by_key(value, "code_id")));
}

// The debug-id should always be non-NULL
TEST_CHECK_STRING_EQUAL(
sentry_value_as_string(sentry_value_get_by_key(x86_exe_val, "code_id")),
"b4c24a6cc995c17fb18a65184a65863cfc01c673");
TEST_CHECK_STRING_EQUAL(sentry_value_as_string(sentry_value_get_by_key(
x86_exe_val, "debug_id")),
"6c4ac2b4-95c9-7fc1-b18a-65184a65863c");
sentry_value_decref(x86_exe_val);
sentry_value_as_string(sentry_value_get_by_key(value, "debug_id")),
expected_debug_id);

sentry_value_t without_id_val = sentry_value_new_object();
sentry_path_t *without_id_path
= sentry__path_join_str(dir, "../fixtures/without-buildid.so");
*buf = sentry__path_read_to_buffer(without_id_path, file_size);
sentry__path_free(without_id_path);
sentry_value_decref(value);
}
#endif

TEST_CHECK(sentry__procmaps_read_ids_from_elf(without_id_val, &module));
sentry_free(*buf);
SENTRY_TEST(build_id_parser)
{
// skipping this on android because it does not have access to the fixtures
#if !defined(SENTRY_PLATFORM_LINUX) || defined(SENTRY_PLATFORM_ANDROID)
SKIP_TEST();
#else
parse_elf_and_check_code_and_build_id("../fixtures/with-buildid.so",
"1c304742f114215453a8a777f6cdb3a2b8505e11",
"4247301c-14f1-5421-53a8-a777f6cdb3a2");

TEST_CHECK(sentry_value_is_null(
sentry_value_get_by_key(without_id_val, "code_id")));
TEST_CHECK_STRING_EQUAL(sentry_value_as_string(sentry_value_get_by_key(
without_id_val, "debug_id")),
"29271919-a2ef-129d-9aac-be85a0948d9c");
sentry_value_decref(without_id_val);
parse_elf_and_check_code_and_build_id("../fixtures/without-buildid-phdr.so",
"1c304742f114215453a8a777f6cdb3a2b8505e11",
"4247301c-14f1-5421-53a8-a777f6cdb3a2");

sentry_value_t x86_lib_val = sentry_value_new_object();
sentry_path_t *x86_lib_path
= sentry__path_join_str(dir, "../fixtures/libstdc++.so");
*buf = sentry__path_read_to_buffer(x86_lib_path, file_size);
sentry__path_free(x86_lib_path);
parse_elf_and_check_code_and_build_id("../fixtures/sentry_example",
"b4c24a6cc995c17fb18a65184a65863cfc01c673",
"6c4ac2b4-95c9-7fc1-b18a-65184a65863c");

TEST_CHECK(sentry__procmaps_read_ids_from_elf(x86_lib_val, &module));
sentry_free(*buf);
parse_elf_and_check_code_and_build_id("../fixtures/without-buildid.so",
NULL, "29271919-a2ef-129d-9aac-be85a0948d9c");

TEST_CHECK(
sentry_value_is_null(sentry_value_get_by_key(x86_lib_val, "code_id")));
TEST_CHECK_STRING_EQUAL(sentry_value_as_string(sentry_value_get_by_key(
x86_lib_val, "debug_id")),
parse_elf_and_check_code_and_build_id("../fixtures/libstdc++.so", NULL,
"7fa824da-38f1-b87c-04df-718fda64990c");
sentry_value_decref(x86_lib_val);

sentry__path_free(dir);
#endif
}
6 changes: 3 additions & 3 deletions tests/unit/tests.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ XX(basic_spans)
XX(basic_tracing_context)
XX(basic_transaction)
XX(bgworker_flush)
XX(buildid_fallback)
XX(build_id_parser)
XX(child_spans)
XX(concurrent_init)
XX(concurrent_uninit)
XX(count_sampled_events)
XX(crash_marker)
XX(crashed_last_run)
XX(crash_marker)
XX(custom_logger)
XX(discarding_before_send)
XX(distributed_headers)
XX(drop_unfinished_spans)
XX(dsn_parsing_complete)
XX(dsn_parsing_invalid)
XX(dsn_store_url_with_path)
XX(dsn_store_url_without_path)
XX(dsn_store_url_with_path)
XX(empty_transport)
XX(fuzz_json)
XX(init_failure)
Expand Down