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

Jump to bottom

テストが異常終了する対策 #1560

Merged
merged 1 commit into from
Mar 3, 2021
Merged

テストが異常終了する対策 #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sakura_core/_main/CProcessFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ bool CProcessFactory::WaitForInitializedControlProcess()
return false;
}
DWORD dwRet;
dwRet = ::WaitForSingleObject( hEvent, 10000 ); // 最大10秒間待つ
dwRet = ::WaitForSingleObject( hEvent, 30000 );
if( WAIT_TIMEOUT == dwRet ){ // コントロールプロセスの初期化が終了しない
::CloseHandle( hEvent );
TopErrorMessage( NULL, L"エディタまたはシステムがビジー状態です。\nしばらく待って開きなおしてください。" );
Expand Down
2 changes: 1 addition & 1 deletion tests/unittests/test-winmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void CControlProcess_WaitForInitialized(std::wstring_view profileName)
handleHolder eventHolder( hEvent );

// 初期化完了イベントを待つ
DWORD dwRet = ::WaitForSingleObject( hEvent, 10000 );
DWORD dwRet = ::WaitForSingleObject( hEvent, 30000 );
if( WAIT_TIMEOUT == dwRet ){
throw std::runtime_error( "waitEvent is timeout." );
}
Expand Down