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

Fix PNS Test App and enable build option in CI

This commit is contained in:
Roberto Fernandez Bautista 2021-06-21 08:51:35 +01:00 committed by Wayne Stambaugh
parent a89f6404b4
commit cd130be2db
8 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/Fedora-Linux-CI.yml
View File

@ -32,6 +32,7 @@ fedora_build_linux:
-DKICAD_USE_OCC=ON -DKICAD_USE_OCC=ON
-DKICAD_SPICE=ON -DKICAD_SPICE=ON
-DKICAD_BUILD_I18N=ON -DKICAD_BUILD_I18N=ON
-DKICAD_BUILD_PNS_DEBUG_TOOL=ON
../../ ../../
- make 2>&1 | tee compilation_log.txt - make 2>&1 | tee compilation_log.txt
- cd ../../ - cd ../../

1
.gitlab/Ubuntu-20.04-CI.yml
View File

@ -40,6 +40,7 @@ ubuntu20.04_build:
-DKICAD_USE_OCC=ON -DKICAD_USE_OCC=ON
-DKICAD_SPICE=ON -DKICAD_SPICE=ON
-DKICAD_BUILD_I18N=ON -DKICAD_BUILD_I18N=ON
-DKICAD_BUILD_PNS_DEBUG_TOOL=ON
../../ ../../
- ninja 2>&1 | tee compilation_log.txt - ninja 2>&1 | tee compilation_log.txt
- cd ../../ - cd ../../

1
.gitlab/Windows-CI.yml
View File

@ -27,6 +27,7 @@ win64_build:
-DKICAD_USE_OCE=OFF ` -DKICAD_USE_OCE=OFF `
-DKICAD_USE_OCC=ON ` -DKICAD_USE_OCC=ON `
-DKICAD_SPICE=ON ` -DKICAD_SPICE=ON `
-DKICAD_BUILD_PNS_DEBUG_TOOL=ON `
../../ ../../
- cmake --build . 2>&1 | tee compilation_log.txt - cmake --build . 2>&1 | tee compilation_log.txt
- cd ../../ - cd ../../

2
qa/pns/CMakeLists.txt
View File

@ -25,7 +25,7 @@
find_package(Boost COMPONENTS unit_test_framework REQUIRED) find_package(Boost COMPONENTS unit_test_framework REQUIRED)
find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc REQUIRED ) find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc REQUIRED )
add_definitions(-DBOOST_TEST_DYN_LINK -DPCBNEW) add_definitions(-DBOOST_TEST_DYN_LINK -DPCBNEW -DTEST_APP_GUI)
add_executable( test_pns add_executable( test_pns

9
qa/pns/logviewer.fbp
View File

@ -14,7 +14,6 @@
<property name="file">pns_log_viewer_frame_base</property> <property name="file">pns_log_viewer_frame_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="image_path_wrapper_function_name"></property>
<property name="indent_with_spaces"></property> <property name="indent_with_spaces"></property>
<property name="internationalize">0</property> <property name="internationalize">0</property>
<property name="name">PNS_LOG_VIEWER</property> <property name="name">PNS_LOG_VIEWER</property>
@ -26,7 +25,6 @@
<property name="skip_php_events">1</property> <property name="skip_php_events">1</property>
<property name="skip_python_events">1</property> <property name="skip_python_events">1</property>
<property name="ui_table">UI</property> <property name="ui_table">UI</property>
<property name="use_array_enum">0</property>
<property name="use_enum">0</property> <property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<object class="Frame" expanded="1"> <object class="Frame" expanded="1">
@ -65,6 +63,7 @@
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">MyMenuBar</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_menubar1</property> <property name="name">m_menubar1</property>
@ -77,7 +76,7 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<object class="wxMenu" expanded="0"> <object class="wxMenu" expanded="1">
<property name="label">File</property> <property name="label">File</property>
<property name="name">m_menu1</property> <property name="name">m_menu1</property>
<property name="permission">protected</property> <property name="permission">protected</property>
@ -206,7 +205,6 @@
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="aui_position"></property> <property name="aui_position"></property>
<property name="aui_row"></property> <property name="aui_row"></property>
<property name="auth_needed">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmap"></property> <property name="bitmap"></property>
@ -346,7 +344,6 @@
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="aui_position"></property> <property name="aui_position"></property>
<property name="aui_row"></property> <property name="aui_row"></property>
<property name="auth_needed">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmap"></property> <property name="bitmap"></property>
@ -457,7 +454,7 @@
<property name="resize">Resizable</property> <property name="resize">Resizable</property>
<property name="show">1</property> <property name="show">1</property>
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style">wxTE_PROCESS_ENTER</property>
<property name="subclass">; ; forward_declare</property> <property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property> <property name="toolbar_pane">0</property>
<property name="tooltip"></property> <property name="tooltip"></property>

4
qa/pns/pns_log_viewer_frame_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Feb 6 2021) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -53,7 +53,7 @@ PNS_LOG_VIEWER_FRAME_BASE::PNS_LOG_VIEWER_FRAME_BASE( wxWindow* parent, wxWindow
fgSizer3->Add( m_rewindRight, 1, wxALL, 5 ); fgSizer3->Add( m_rewindRight, 1, wxALL, 5 );
m_rewindPos = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_rewindPos = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
fgSizer3->Add( m_rewindPos, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); fgSizer3->Add( m_rewindPos, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );

4
qa/pns/pns_log_viewer_frame_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Feb 6 2021) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -50,7 +50,7 @@ class PNS_LOG_VIEWER_FRAME_BASE : public wxFrame
wxTreeListCtrl* m_itemList; wxTreeListCtrl* m_itemList;
wxStatusBar* m_statusBar; wxStatusBar* m_statusBar;
// Virtual event handlers, override them in your derived class // Virtual event handlers, overide them in your derived class
virtual void onReload( wxCommandEvent& event ) { event.Skip(); } virtual void onReload( wxCommandEvent& event ) { event.Skip(); }
virtual void onExit( wxCommandEvent& event ) { event.Skip(); } virtual void onExit( wxCommandEvent& event ) { event.Skip(); }
virtual void onBtnRewindLeft( wxCommandEvent& event ) { event.Skip(); } virtual void onBtnRewindLeft( wxCommandEvent& event ) { event.Skip(); }

4
qa/qa_utils/test_app_main.cpp
View File

@ -254,7 +254,11 @@ int main( int argc, char** argv )
{ {
wxInitialize( argc, argv ); wxInitialize( argc, argv );
#ifdef TEST_APP_GUI
Pgm().InitPgm( false );
#else
Pgm().InitPgm( true ); Pgm().InitPgm( true );
#endif
auto ret = wxEntry( argc, argv ); auto ret = wxEntry( argc, argv );