Skip to content

Commit

Permalink
fix(userspace/libsinsp/test): solve wasm failure cases
Browse files Browse the repository at this point in the history 
Signed-off-by: Jason Dellaluce <jasondellaluce@gmail.com>
  • Loading branch information
@jasondellaluce
jasondellaluce committed Aug 2, 2023
1 parent 7fe34b8 commit d286d32
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 7 deletions.
1 change: 1 addition & 0 deletions userspace/libsinsp/examples/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ target_link_libraries(sinsp-example
if (EMSCRIPTEN)
target_compile_options(sinsp-example PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")
target_link_options(sinsp-example PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")
target_link_options(sinsp-example PRIVATE "-sALLOW_MEMORY_GROWTH=1")
target_link_options(sinsp-example PRIVATE "-sEXPORTED_FUNCTIONS=['_main','_htons','_ntohs']")
endif()

Expand Down
4 changes: 4 additions & 0 deletions userspace/libsinsp/test/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@ add_executable(unit-test-libsinsp ${LIBSINSP_UNIT_TESTS_SOURCES})
if (EMSCRIPTEN)
target_compile_options(unit-test-libsinsp PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")
target_link_options(unit-test-libsinsp PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")
target_link_options(unit-test-libsinsp PRIVATE "-sALLOW_MEMORY_GROWTH=1")
target_link_options(unit-test-libsinsp PRIVATE "-sEXPORTED_FUNCTIONS=['_main','_htons','_ntohs']")
# note(jasondellaluce): since we run tests with node, we need to add this
# for reading from local capture files.
target_link_options(unit-test-libsinsp PRIVATE "-sNODERAWFS=1")
endif()

target_link_libraries(unit-test-libsinsp
Expand Down
25 changes: 20 additions & 5 deletions userspace/libsinsp/test/classes/sinsp_thread_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ TEST(sinsp_thread_manager, thread_group_manager)
TEST(sinsp_thread_manager, create_thread_dependencies_null_pointer)
{
sinsp m_inspector;
m_inspector.open_nodriver();
struct scap_test_input_data data;
data.event_count = 0;
data.thread_count = 0;
m_inspector.open_test_input(&data, SCAP_MODE_NODRIVER);

auto tinfo = std::make_shared<sinsp_threadinfo>();
tinfo.reset();
Expand All @@ -64,7 +67,10 @@ TEST(sinsp_thread_manager, create_thread_dependencies_null_pointer)
TEST(sinsp_thread_manager, create_thread_dependencies_invalid_tinfo)
{
sinsp m_inspector;
m_inspector.open_nodriver();
struct scap_test_input_data data;
data.event_count = 0;
data.thread_count = 0;
m_inspector.open_test_input(&data, SCAP_MODE_NODRIVER);

auto tinfo = std::make_shared<sinsp_threadinfo>();
tinfo->m_tid = 4;
Expand All @@ -79,7 +85,10 @@ TEST(sinsp_thread_manager, create_thread_dependencies_invalid_tinfo)
TEST(sinsp_thread_manager, create_thread_dependencies_tginfo_already_there)
{
sinsp m_inspector;
m_inspector.open_nodriver();
struct scap_test_input_data data;
data.event_count = 0;
data.thread_count = 0;
m_inspector.open_test_input(&data, SCAP_MODE_NODRIVER);

auto tinfo = std::make_shared<sinsp_threadinfo>();
tinfo->m_tid = 4;
Expand All @@ -97,7 +106,10 @@ TEST(sinsp_thread_manager, create_thread_dependencies_tginfo_already_there)
TEST(sinsp_thread_manager, create_thread_dependencies_new_tginfo)
{
sinsp m_inspector;
m_inspector.open_nodriver();
struct scap_test_input_data data;
data.event_count = 0;
data.thread_count = 0;
m_inspector.open_test_input(&data, SCAP_MODE_NODRIVER);

auto tinfo = std::make_shared<sinsp_threadinfo>();
tinfo->m_tid = 51000;
Expand All @@ -115,7 +127,10 @@ TEST(sinsp_thread_manager, create_thread_dependencies_new_tginfo)
TEST(sinsp_thread_manager, create_thread_dependencies_use_existing_tginfo)
{
sinsp m_inspector;
m_inspector.open_nodriver();
struct scap_test_input_data data;
data.event_count = 0;
data.thread_count = 0;
m_inspector.open_test_input(&data, SCAP_MODE_NODRIVER);

auto tinfo = std::make_shared<sinsp_threadinfo>();
tinfo->m_tid = 51000;
Expand Down
4 changes: 2 additions & 2 deletions userspace/libsinsp/test/events_file.ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,13 @@ TEST_F(sinsp_with_test_input, creates_fd_generic)

int64_t fd1 = 3, fd2 = 4;
add_event_advance_ts(increasing_ts(), 1, PPME_SYSCALL_PIPE_E, 0);
evt = add_event_advance_ts(increasing_ts(), 1, PPME_SYSCALL_PIPE_X, 4, 0, fd1, fd2, (uint64_t)81976492);
evt = add_event_advance_ts(increasing_ts(), 1, PPME_SYSCALL_PIPE_X, 4, (int64_t) 0, fd1, fd2, (uint64_t)81976492);
ASSERT_EQ(get_field_as_string(evt, "fd.type"), "pipe");
ASSERT_EQ(get_field_as_string(evt, "fd.typechar"), "p");
ASSERT_EQ(get_field_as_string(evt, "fd.num"), "4");

add_event_advance_ts(increasing_ts(), 1, PPME_SYSCALL_PIPE2_E, 0);
evt = add_event_advance_ts(increasing_ts(), 1, PPME_SYSCALL_PIPE2_X, 5, 0, (int64_t)6, (int64_t)7, (uint64_t)81976492, (uint32_t)17);
evt = add_event_advance_ts(increasing_ts(), 1, PPME_SYSCALL_PIPE2_X, 5, (int64_t) 0, (int64_t)6, (int64_t)7, (uint64_t)81976492, (uint32_t)17);
ASSERT_EQ(get_field_as_string(evt, "fd.type"), "pipe");
ASSERT_EQ(get_field_as_string(evt, "fd.typechar"), "p");
ASSERT_EQ(get_field_as_string(evt, "fd.num"), "7");
Expand Down

0 comments on commit d286d32

Please sign in to comment.