haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error handling when reading test board data

This commit is contained in:
John Beard 2023-12-11 19:47:06 +00:00
parent 3c0566d318
commit 11be5d6f1d
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qa/pcbnew_utils/board_file_utils.cpp
View File

@ -93,7 +93,7 @@ std::unique_ptr<BOARD_ITEM> ReadBoardItemFromStream( std::istream& aStream )
std::unique_ptr<BOARD> ReadBoardFromFileOrStream( const std::string& aFilename, std::unique_ptr<BOARD> ReadBoardFromFileOrStream( const std::string& aFilename,
std::istream& aFallback ) std::istream& aFallback )
{ {
std::istream* in_stream = nullptr; std::istream* in_stream = nullptr;
std::ifstream file_stream; std::ifstream file_stream;
@ -106,6 +106,12 @@ std::unique_ptr<BOARD> ReadBoardFromFileOrStream( const std::string& aFilename,
else else
{ {
file_stream.open( aFilename ); file_stream.open( aFilename );
if( !file_stream.is_open() )
{
return nullptr;
}
in_stream = &file_stream; in_stream = &file_stream;
} }
@ -127,6 +133,12 @@ std::unique_ptr<FOOTPRINT> ReadFootprintFromFileOrStream( const std::string& aFi
else else
{ {
file_stream.open( aFilename ); file_stream.open( aFilename );
if( !file_stream.is_open() )
{
return nullptr;
}
in_stream = &file_stream; in_stream = &file_stream;
} }

12
qa/pcbnew_utils/board_test_utils.cpp
View File

@ -86,7 +86,17 @@ void LoadBoard( SETTINGS_MANAGER& aSettingsManager, const wxString& aRelPath,
else if( legacyProject.Exists() ) else if( legacyProject.Exists() )
aSettingsManager.LoadProject( legacyProject.GetFullPath() ); aSettingsManager.LoadProject( legacyProject.GetFullPath() );
aBoard = ReadBoardFromFileOrStream( boardPath ); BOOST_TEST_MESSAGE( "Loading board file: " << boardPath );
try {
aBoard = ReadBoardFromFileOrStream( boardPath );
}
catch( const IO_ERROR& ioe )
{
BOOST_TEST_ERROR( ioe.What() );
}
BOOST_REQUIRE( aBoard );
if( projectFile.Exists() || legacyProject.Exists() ) if( projectFile.Exists() || legacyProject.Exists() )
aBoard->SetProject( &aSettingsManager.Prj() ); aBoard->SetProject( &aSettingsManager.Prj() );