diff --git a/starboard/common/test_main.cc b/starboard/common/test_main.cc index f0e590b9956b..247a7a51e28c 100644 --- a/starboard/common/test_main.cc +++ b/starboard/common/test_main.cc @@ -16,6 +16,7 @@ #include "build/build_config.h" #include "starboard/client_porting/wrap_main/wrap_main.h" +#include "starboard/common/log.h" #include "starboard/event.h" #include "starboard/system.h" #include "testing/gtest/include/gtest/gtest.h" @@ -23,6 +24,7 @@ namespace { int InitAndRunAllTests(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); + SB_LOG(INFO) << "In InitAndRunAllTests"; return RUN_ALL_TESTS(); } } // namespace @@ -31,6 +33,8 @@ int InitAndRunAllTests(int argc, char** argv) { // For the Starboard OS define SbEventHandle as the entry point SB_EXPORT STARBOARD_WRAP_SIMPLE_MAIN(InitAndRunAllTests); +#if !defined(IS_COBALT_HERMETIC_BUILD) + #if !SB_IS(EVERGREEN) // Define main() for non-Evergreen Starboard OS. int main(int argc, char** argv) { @@ -42,4 +46,6 @@ int main(int argc, char** argv) { int main(int argc, char** argv) { return InitAndRunAllTests(argc, argv); } + +#endif // !defined(IS_COBALT_HERMETIC_BUILD) #endif // BUILDFLAG(IS_STARBOARD) diff --git a/starboard/linux/x64x11/run_starboard_main.cc b/starboard/linux/x64x11/run_starboard_main.cc index 96b605f96a68..a6b91832f7bb 100644 --- a/starboard/linux/x64x11/run_starboard_main.cc +++ b/starboard/linux/x64x11/run_starboard_main.cc @@ -18,6 +18,7 @@ #include "starboard/shared/x11/application_x11.h" int SbRunStarboardMain(int argc, char** argv, SbEventHandleCallback callback) { + SB_LOG(INFO) << "SbRunStarboardMain loader"; starboard::shared::x11::ApplicationX11 application(callback); int result = 0; { diff --git a/starboard/linux/x64x11/starboard_loader.cc b/starboard/linux/x64x11/starboard_loader.cc index 43f888937402..63987a2395eb 100644 --- a/starboard/linux/x64x11/starboard_loader.cc +++ b/starboard/linux/x64x11/starboard_loader.cc @@ -23,13 +23,18 @@ int main(int argc, char** argv) { void* handle_ = dlopen(s_target_lib_path, RTLD_LAZY); if (!handle_) { std::cerr << "dlopen failure: " << dlerror() << std::endl; + } else { + printf("loaded SB_LOADER_MODULE module succcessfully \n"); } void* callback = nullptr; callback = dlsym(handle_, "SbEventHandle"); if (!callback) { std::cerr << "dlsym failure: " << dlerror() << std::endl; + } else { + printf("loaded SbEventHandle succcessfully\n"); } + return SbRunStarboardMain(argc, argv, reinterpret_cast(callback)); } diff --git a/starboard/nplb/BUILD.gn b/starboard/nplb/BUILD.gn index 6910b4e02555..58b1a484cf00 100644 --- a/starboard/nplb/BUILD.gn +++ b/starboard/nplb/BUILD.gn @@ -39,204 +39,205 @@ test("nplb") { sources = [ "//starboard/common/test_main.cc", - "//starboard/nplb/sabi/alignment_test.cc", - "//starboard/nplb/sabi/endianness_test.cc", - "//starboard/nplb/sabi/signedness_and_size_of_enum_test.cc", - "//starboard/nplb/sabi/signedness_of_char_test.cc", - "//starboard/nplb/sabi/size_test.cc", - "//starboard/nplb/sabi/struct_alignment_test.cc", - "//starboard/shared/starboard/drm/drm_test_helpers.cc", - "//starboard/shared/starboard/drm/drm_test_helpers.h", - "//starboard/testing/fake_graphics_context_provider.cc", - "//starboard/testing/fake_graphics_context_provider.h", - "align_test.cc", - "audio_sink_create_test.cc", - "audio_sink_destroy_test.cc", - "audio_sink_get_max_channels_test.cc", - "audio_sink_get_min_buffer_size_in_frames_test.cc", - "audio_sink_get_nearest_supported_sample_frequency_test.cc", - "audio_sink_helpers.cc", - "audio_sink_helpers.h", - "audio_sink_is_audio_frame_storage_type_supported_test.cc", - "audio_sink_is_audio_sample_type_supported_test.cc", - "audio_sink_test.cc", - "char_is_signed_test.cc", - "configuration_test.cc", - "cpu_features_get_test.cc", - "drm_get_metrics_test.cc", - "drm_helpers.h", - "drm_is_server_certificate_updatable_test.cc", - "drm_session_test.cc", - "drm_update_server_certificate_test.cc", - "egl_test.cc", - "extern_c_test.cc", - "file_atomic_replace_test.cc", - "file_delete_recursive_test.cc", - "file_helpers.cc", - "flat_map_test.cc", - "gles_test.cc", - "include_all.c", - "include_all_too.c", - "key_test.cc", - "log_flush_test.cc", - "log_format_test.cc", - "log_raw_dump_stack_test.cc", - "log_raw_test.cc", - "log_test.cc", + + # "//starboard/nplb/sabi/alignment_test.cc", + # "//starboard/nplb/sabi/endianness_test.cc", + # "//starboard/nplb/sabi/signedness_and_size_of_enum_test.cc", + # "//starboard/nplb/sabi/signedness_of_char_test.cc", + # "//starboard/nplb/sabi/size_test.cc", + # "//starboard/nplb/sabi/struct_alignment_test.cc", + # "//starboard/shared/starboard/drm/drm_test_helpers.cc", + # "//starboard/shared/starboard/drm/drm_test_helpers.h", + # "//starboard/testing/fake_graphics_context_provider.cc", + # "//starboard/testing/fake_graphics_context_provider.h", + # "align_test.cc", + # "audio_sink_create_test.cc", + # "audio_sink_destroy_test.cc", + # "audio_sink_get_max_channels_test.cc", + # "audio_sink_get_min_buffer_size_in_frames_test.cc", + # "audio_sink_get_nearest_supported_sample_frequency_test.cc", + # "audio_sink_helpers.cc", + # "audio_sink_helpers.h", + # "audio_sink_is_audio_frame_storage_type_supported_test.cc", + # "audio_sink_is_audio_sample_type_supported_test.cc", + # "audio_sink_test.cc", + # "char_is_signed_test.cc", + # "configuration_test.cc", + # "cpu_features_get_test.cc", + # "drm_get_metrics_test.cc", + # "drm_helpers.h", + # "drm_is_server_certificate_updatable_test.cc", + # "drm_session_test.cc", + # "drm_update_server_certificate_test.cc", + # "egl_test.cc", + # "extern_c_test.cc", + # "file_atomic_replace_test.cc", + # "file_delete_recursive_test.cc", + # "file_helpers.cc", + # "flat_map_test.cc", + # "gles_test.cc", + # "include_all.c", + # "include_all_too.c", + # "key_test.cc", + # "log_flush_test.cc", + # "log_format_test.cc", + # "log_raw_dump_stack_test.cc", + # "log_raw_test.cc", + # "log_test.cc", # TODO: Separate functions tested by media buffer test into multiple # files. - "drm_create_system_test.cc", - "maximum_player_configuration_explorer.cc", - "maximum_player_configuration_explorer.h", - "media_buffer_test.cc", - "media_can_play_mime_and_key_system_test.cc", - "media_configuration_test.cc", - "microphone_close_test.cc", - "microphone_create_test.cc", - "microphone_destroy_test.cc", - "microphone_get_available_test.cc", - "microphone_is_sample_rate_supported_test.cc", - "microphone_open_test.cc", - "microphone_read_test.cc", - "murmurhash2_test.cc", - "optional_test.cc", - "player_creation_param_helpers.cc", - "player_creation_param_helpers.h", - "player_get_preferred_output_mode_test.cc", - "player_test_util.cc", - "player_test_util.h", - "posix_compliance/posix_arpa_inet_test.cc", - "posix_compliance/posix_condition_variable_broadcast_test.cc", - "posix_compliance/posix_condition_variable_create_test.cc", - "posix_compliance/posix_condition_variable_destroy_test.cc", - "posix_compliance/posix_condition_variable_signal_test.cc", - "posix_compliance/posix_condition_variable_wait_test.cc", - "posix_compliance/posix_condition_variable_wait_timed_test.cc", - "posix_compliance/posix_directory_can_open_test.cc", - "posix_compliance/posix_directory_create_test.cc", - "posix_compliance/posix_directory_get_next_test.cc", - "posix_compliance/posix_directory_open_test.cc", - "posix_compliance/posix_file_can_open_test.cc", - "posix_compliance/posix_file_close_test.cc", - "posix_compliance/posix_file_delete_test.cc", - "posix_compliance/posix_file_fsync_test.cc", - "posix_compliance/posix_file_ftruncate_test.cc", - "posix_compliance/posix_file_get_info_test.cc", - "posix_compliance/posix_file_get_path_info_test.cc", - "posix_compliance/posix_file_mode_string_to_flags_test.cc", - "posix_compliance/posix_file_open_test.cc", - "posix_compliance/posix_file_read_test.cc", - "posix_compliance/posix_file_seek_test.cc", - "posix_compliance/posix_file_write_test.cc", - "posix_compliance/posix_memory_allocate_aligned_test.cc", - "posix_compliance/posix_memory_allocate_test.cc", - "posix_compliance/posix_memory_deallocate_aligned_test.cc", - "posix_compliance/posix_memory_deallocate_test.cc", - "posix_compliance/posix_memory_map_test.cc", - "posix_compliance/posix_mutex_acquire_test.cc", - "posix_compliance/posix_mutex_acquire_try_test.cc", - "posix_compliance/posix_mutex_create_test.cc", - "posix_compliance/posix_mutex_destroy_test.cc", - "posix_compliance/posix_once_test.cc", - "posix_compliance/posix_socket_accept_test.cc", - "posix_compliance/posix_socket_bind_test.cc", - "posix_compliance/posix_socket_connect_test.cc", - "posix_compliance/posix_socket_create_test.cc", - "posix_compliance/posix_socket_errno_test.cc", - "posix_compliance/posix_socket_helpers.cc", - "posix_compliance/posix_socket_join_multicast_group_test.cc", - "posix_compliance/posix_socket_listen_test.cc", - "posix_compliance/posix_socket_receive_test.cc", - "posix_compliance/posix_socket_recvfrom_test.cc", - "posix_compliance/posix_socket_resolve_test.cc", - "posix_compliance/posix_socket_send_test.cc", - "posix_compliance/posix_socket_sendto_test.cc", - "posix_compliance/posix_socket_set_options_test.cc", - "posix_compliance/posix_socket_waiter_add_test.cc", - "posix_compliance/posix_socket_waiter_remove_test.cc", - "posix_compliance/posix_socket_waiter_wait_test.cc", - "posix_compliance/posix_socket_waiter_wait_timed_test.cc", - "posix_compliance/posix_string_compare_no_case_n_test.cc", - "posix_compliance/posix_string_compare_no_case_test.cc", - "posix_compliance/posix_string_format_test.cc", - "posix_compliance/posix_string_format_wide_test.cc", - "posix_compliance/posix_string_scan_test.cc", - "posix_compliance/posix_thread_attr_test.cc", - "posix_compliance/posix_thread_create_test.cc", - "posix_compliance/posix_thread_detach_test.cc", - "posix_compliance/posix_thread_get_current_test.cc", - "posix_compliance/posix_thread_get_name_test.cc", - "posix_compliance/posix_thread_helpers.cc", - "posix_compliance/posix_thread_is_equal_test.cc", - "posix_compliance/posix_thread_join_test.cc", - "posix_compliance/posix_thread_local_value_test.cc", - "posix_compliance/posix_thread_set_name_test.cc", - "posix_compliance/posix_thread_sleep_test.cc", - "posix_compliance/posix_thread_yield_test.cc", - "posix_compliance/posix_time_test.cc", - "random_helpers.cc", - "recursive_mutex_test.cc", - "semaphore_test.cc", - "socket_helpers.cc", - "socket_waiter_create_test.cc", - "socket_waiter_destroy_test.cc", - "socket_waiter_wake_up_test.cc", - "socket_wrapper_test.cc", - "storage_close_record_test.cc", - "storage_get_record_size_test.cc", - "storage_read_record_test.cc", - "storage_write_record_test.cc", - "system_clear_last_error_test.cc", - "system_get_error_string_test.cc", - "system_get_extension_test.cc", - "system_get_last_error_test.cc", - "system_get_locale_id_test.cc", - "system_get_number_of_processors_test.cc", - "system_get_path_test.cc", - "system_get_property_test.cc", - "system_get_random_data_test.cc", - "system_get_random_uint64_test.cc", - "system_get_stack_test.cc", - "system_get_total_cpu_memory_test.cc", - "system_get_total_gpu_memory_test.cc", - "system_get_used_cpu_memory_test.cc", - "system_get_used_gpu_memory_test.cc", - "system_has_capability_test.cc", - "system_hide_splash_screen_test.cc", - "system_is_debugger_attached_test.cc", - "system_network_status_test.cc", - "system_sign_with_certification_secret_key_test.cc", - "system_symbolize_test.cc", - "thread_get_id_test.cc", - "thread_priority_test.cc", - "thread_sampler_test.cc", - "thread_test.cc", - "time_zone_get_current_test.cc", - "time_zone_get_name_test.cc", - "ui_navigation_test.cc", - "undefined_behavior_test.cc", - "url_player_create_test.cc", + # "drm_create_system_test.cc", + # "maximum_player_configuration_explorer.cc", + # "maximum_player_configuration_explorer.h", + # "media_buffer_test.cc", + # "media_can_play_mime_and_key_system_test.cc", + # "media_configuration_test.cc", + # "microphone_close_test.cc", + # "microphone_create_test.cc", + # "microphone_destroy_test.cc", + # "microphone_get_available_test.cc", + # "microphone_is_sample_rate_supported_test.cc", + # "microphone_open_test.cc", + # "microphone_read_test.cc", + # "murmurhash2_test.cc", + # "optional_test.cc", + # "player_creation_param_helpers.cc", + # "player_creation_param_helpers.h", + # "player_get_preferred_output_mode_test.cc", + # "player_test_util.cc", + # "player_test_util.h", + # "posix_compliance/posix_arpa_inet_test.cc", + # "posix_compliance/posix_condition_variable_broadcast_test.cc", + # "posix_compliance/posix_condition_variable_create_test.cc", + # "posix_compliance/posix_condition_variable_destroy_test.cc", + # "posix_compliance/posix_condition_variable_signal_test.cc", + # "posix_compliance/posix_condition_variable_wait_test.cc", + # "posix_compliance/posix_condition_variable_wait_timed_test.cc", + # "posix_compliance/posix_directory_can_open_test.cc", + # "posix_compliance/posix_directory_create_test.cc", + # "posix_compliance/posix_directory_get_next_test.cc", + # "posix_compliance/posix_directory_open_test.cc", + # "posix_compliance/posix_file_can_open_test.cc", + # "posix_compliance/posix_file_close_test.cc", + # "posix_compliance/posix_file_delete_test.cc", + # "posix_compliance/posix_file_fsync_test.cc", + # "posix_compliance/posix_file_ftruncate_test.cc", + # "posix_compliance/posix_file_get_info_test.cc", + # "posix_compliance/posix_file_get_path_info_test.cc", + # "posix_compliance/posix_file_mode_string_to_flags_test.cc", + # "posix_compliance/posix_file_open_test.cc", + # "posix_compliance/posix_file_read_test.cc", + # "posix_compliance/posix_file_seek_test.cc", + # "posix_compliance/posix_file_write_test.cc", + # "posix_compliance/posix_memory_allocate_aligned_test.cc", + # "posix_compliance/posix_memory_allocate_test.cc", + # "posix_compliance/posix_memory_deallocate_aligned_test.cc", + # "posix_compliance/posix_memory_deallocate_test.cc", + # "posix_compliance/posix_memory_map_test.cc", + # "posix_compliance/posix_mutex_acquire_test.cc", + # "posix_compliance/posix_mutex_acquire_try_test.cc", + # "posix_compliance/posix_mutex_create_test.cc", + # "posix_compliance/posix_mutex_destroy_test.cc", + # "posix_compliance/posix_once_test.cc", + # "posix_compliance/posix_socket_accept_test.cc", + # "posix_compliance/posix_socket_bind_test.cc", + # "posix_compliance/posix_socket_connect_test.cc", + # "posix_compliance/posix_socket_create_test.cc", + # "posix_compliance/posix_socket_errno_test.cc", + # "posix_compliance/posix_socket_helpers.cc", + # "posix_compliance/posix_socket_join_multicast_group_test.cc", + # "posix_compliance/posix_socket_listen_test.cc", + # "posix_compliance/posix_socket_receive_test.cc", + # "posix_compliance/posix_socket_recvfrom_test.cc", + # "posix_compliance/posix_socket_resolve_test.cc", + # "posix_compliance/posix_socket_send_test.cc", + # "posix_compliance/posix_socket_sendto_test.cc", + # "posix_compliance/posix_socket_set_options_test.cc", + # "posix_compliance/posix_socket_waiter_add_test.cc", + # "posix_compliance/posix_socket_waiter_remove_test.cc", + # "posix_compliance/posix_socket_waiter_wait_test.cc", + # "posix_compliance/posix_socket_waiter_wait_timed_test.cc", + # "posix_compliance/posix_string_compare_no_case_n_test.cc", + # "posix_compliance/posix_string_compare_no_case_test.cc", + # "posix_compliance/posix_string_format_test.cc", + # "posix_compliance/posix_string_format_wide_test.cc", + # "posix_compliance/posix_string_scan_test.cc", + # "posix_compliance/posix_thread_attr_test.cc", + # "posix_compliance/posix_thread_create_test.cc", + # "posix_compliance/posix_thread_detach_test.cc", + # "posix_compliance/posix_thread_get_current_test.cc", + # "posix_compliance/posix_thread_get_name_test.cc", + # "posix_compliance/posix_thread_helpers.cc", + # "posix_compliance/posix_thread_is_equal_test.cc", + # "posix_compliance/posix_thread_join_test.cc", + # "posix_compliance/posix_thread_local_value_test.cc", + # "posix_compliance/posix_thread_set_name_test.cc", + # "posix_compliance/posix_thread_sleep_test.cc", + # "posix_compliance/posix_thread_yield_test.cc", + # "posix_compliance/posix_time_test.cc", + # "random_helpers.cc", + # "recursive_mutex_test.cc", + # "semaphore_test.cc", + # "socket_helpers.cc", + # "socket_waiter_create_test.cc", + # "socket_waiter_destroy_test.cc", + # "socket_waiter_wake_up_test.cc", + # "socket_wrapper_test.cc", + # "storage_close_record_test.cc", + # "storage_get_record_size_test.cc", + # "storage_read_record_test.cc", + # "storage_write_record_test.cc", + # "system_clear_last_error_test.cc", + # "system_get_error_string_test.cc", + # "system_get_extension_test.cc", + # "system_get_last_error_test.cc", + # "system_get_locale_id_test.cc", + # "system_get_number_of_processors_test.cc", + # "system_get_path_test.cc", + # "system_get_property_test.cc", + # "system_get_random_data_test.cc", + # "system_get_random_uint64_test.cc", + # "system_get_stack_test.cc", + # "system_get_total_cpu_memory_test.cc", + # "system_get_total_gpu_memory_test.cc", + # "system_get_used_cpu_memory_test.cc", + # "system_get_used_gpu_memory_test.cc", + # "system_has_capability_test.cc", + # "system_hide_splash_screen_test.cc", + # "system_is_debugger_attached_test.cc", + # "system_network_status_test.cc", + # "system_sign_with_certification_secret_key_test.cc", + # "system_symbolize_test.cc", + # "thread_get_id_test.cc", + # "thread_priority_test.cc", + # "thread_sampler_test.cc", + # "thread_test.cc", + # "time_zone_get_current_test.cc", + # "time_zone_get_name_test.cc", + # "ui_navigation_test.cc", + # "undefined_behavior_test.cc", + # "url_player_create_test.cc", ] if (!is_android) { sources += [ - "maximum_player_configuration_explorer_test.cc", - "media_set_audio_write_duration_test.cc", - "multiple_player_test.cc", - "player_create_test.cc", - "player_get_audio_configuration_test.cc", - "player_get_media_time_test.cc", - "player_test_fixture.cc", - "player_test_fixture.h", - "player_write_sample_test.cc", - "speech_synthesis_basic_test.cc", - "vertical_video_test.cc", - "window_create_test.cc", - "window_destroy_test.cc", - "window_get_diagonal_size_in_inches_test.cc", - "window_get_platform_handle_test.cc", - "window_get_size_test.cc", + # "maximum_player_configuration_explorer_test.cc", + # "media_set_audio_write_duration_test.cc", + # "multiple_player_test.cc", + # "player_create_test.cc", + # "player_get_audio_configuration_test.cc", + # "player_get_media_time_test.cc", + # "player_test_fixture.cc", + # "player_test_fixture.h", + # "player_write_sample_test.cc", + # "speech_synthesis_basic_test.cc", + # "vertical_video_test.cc", + # "window_create_test.cc", + # "window_destroy_test.cc", + # "window_get_diagonal_size_in_inches_test.cc", + # "window_get_platform_handle_test.cc", + # "window_get_size_test.cc", ] } @@ -285,7 +286,7 @@ test("nplb") { } # TODO: b/297808555 - Add these tests for all modular builds. - if (sb_has_unused_symbol_issue) { + if (false) { sources -= [ "maximum_player_configuration_explorer.cc", "maximum_player_configuration_explorer.h", diff --git a/starboard/shared/x11/application_x11.cc b/starboard/shared/x11/application_x11.cc index bac7cd074507..c04b401eb905 100644 --- a/starboard/shared/x11/application_x11.cc +++ b/starboard/shared/x11/application_x11.cc @@ -702,10 +702,13 @@ ApplicationX11::ApplicationX11(SbEventHandleCallback sb_event_handle_callback) display_(NULL), paste_buffer_key_release_pending_(false) { ::starboard::shared::starboard::audio_sink::SbAudioSinkImpl::Initialize(); + SB_LOG(INFO) << "Before NetworkNotifier::GetOrCreateInstance()"; NetworkNotifier::GetOrCreateInstance(); + SB_LOG(INFO) << "After NetworkNotifier::GetOrCreateInstance()"; } ApplicationX11::~ApplicationX11() { + SB_LOG(INFO) << "Entered teardown"; ::starboard::shared::starboard::audio_sink::SbAudioSinkImpl::TearDown(); }