GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r593:4f5a18bbe2b7

Merge pull request from SCIQLOP develop...

perrinel -

r593:4f5a18bbe2b7

parent child

Context file:

r593:4f5a18bbe2b7

core/tests/meson.build +7 -7

             tests = [
-              [['Data/TestDataSeries.cpp'],['test_data'],['DataSeries test']],
+              [['Data/TestDataSeries.cpp'],'test_data','DataSeries test'],
-              [['Data/TestOneDimArrayData.cpp'],['test_1d'],['One Dim Array test']],
+              [['Data/TestOneDimArrayData.cpp'],'test_1d','One Dim Array test'],
-              [['Data/TestTwoDimArrayData.cpp'],['test_2d'],['Two Dim Array test']],
+              [['Data/TestTwoDimArrayData.cpp'],'test_2d','Two Dim Array test'],
-              [['DataSource/TestDataSourceController.cpp'],['test_data_source'],['DataSourceController test']],
+              [['DataSource/TestDataSourceController.cpp'],'test_data_source','DataSourceController test'],
-              [['Variable/TestVariableCacheController.cpp'],['test_variable_cache'],['VariableCacheController test']],
+              [['Variable/TestVariableCacheController.cpp'],'test_variable_cache','VariableCacheController test'],
-              [['Variable/TestVariable.cpp'],['test_variable'],['Variable test']]
+              [['Variable/TestVariable.cpp'],'test_variable','Variable test']
             ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
               test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
                                       link_with : sciqlop_core,
                                       include_directories : core_inc,
                                       dependencies : [qt5core, qt5widgets, qt5network,qt5test])
-              test(unit_test[2], test_exe)
+              test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])])
             endforeach

meson.build +1 -2

             project('SciQLOP', 'cpp',default_options : ['cpp_std=c++14'])
             qt5 = import('qt5')
             qt5core = dependency('qt5', modules : 'Core')
             qt5widgets = dependency('qt5', modules : 'Widgets')
             qt5gui = dependency('qt5', modules : 'Gui')
             qt5svg = dependency('qt5', modules : 'Svg')
             qt5xml = dependency('qt5', modules : 'Xml')
             qt5network = dependency('qt5', modules : 'Network')
             qt5printsupport = dependency('qt5', modules : 'PrintSupport')
             qt5test = dependency('qt5', modules : 'Test')
             moc = find_program('moc','moc-qt5')
             subdir('core')
             subdir('gui')
             subdir('app')
             subdir('plugins')
             if build_machine.system()=='darwin'
               install_data('build_cfg/mac/sciqlopLOGO.icns', install_dir : 'Contents/Resources')
               install_data('build_cfg/mac/Info.plist', install_dir : 'Contents')
               meson.add_install_script('build_cfg/mac/install_script.sh')
             elif host_machine.system()=='windows'
               meson.add_install_script('build_cfg/windows/install_script.sh')
             endif
             cppcheck = find_program('cppcheck', required : false)
             if cppcheck.found()
               run_target('cppcheck',
                           command : [cppcheck, '--enable=all',
-                          '--project=' + join_paths(meson.build_root(), 'compile_commands.json')],
+                          '--project=' + join_paths(meson.build_root(), 'compile_commands.json')]
-                          build_by_default : true
                           )
             endif

plugins/amda/meson.build +4 -4

             amdaplugin_moc_headers = [
               'include/AmdaPlugin.h'
             ]
             amdaplugin_sources = [
               'src/AmdaDefs.cpp',
               'src/AmdaParser.cpp',
               'src/AmdaPlugin.cpp',
               'src/AmdaProvider.cpp',
               'src/AmdaResultParser.cpp'
             ]
             amdaplugin_ui_files = []
             amdaplugin_resources_files = [
               'resources/amdaresources.qrc'
             ]
             amdaplugin_inc = include_directories(['include', '../../plugin/include'])
             gen = generator(moc,
                             output  : 'moc_@BASENAME@.cpp',
                             arguments : ['@INPUT@',
                              '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
                              '-I', meson.current_source_dir()+'/include',
                              '-I', meson.current_source_dir()+'/../../plugin/include',
                              '-o', '@OUTPUT@'])
             amdaplugin_moc_plugin_files = gen.process(amdaplugin_moc_headers)
             amdaplugin_moc_files = qt5.preprocess(
                                            ui_files : amdaplugin_ui_files,
                                            qresources : amdaplugin_resources_files)
             sciqlop_amdaplugin = library('amdaplugin',
                                    amdaplugin_sources,
                                    amdaplugin_moc_files,
                                    amdaplugin_moc_plugin_files,
                                    cpp_args : '-DAMDA_LIB',
                                    link_with : [sciqlop_core, sciqlop_gui],
                                    include_directories : [amdaplugin_inc, core_inc, gui_inc],
                                    dependencies : [qt5core, qt5gui, qt5widgets, qt5network],
                                    install : true
                                    )
             tests = [
-              [['tests/TestAmdaParser.cpp'],['test_amda_parser'],['AMDA parser test']],
+              [['tests/TestAmdaParser.cpp'],'test_amda_parser','AMDA parser test'],
-              [['tests/TestAmdaResultParser.cpp'],['test_amda_result_parser'],['AMDA result parser test']],
+              [['tests/TestAmdaResultParser.cpp'],'test_amda_result_parser','AMDA result parser test'],
-              [['tests/TestAmdaAcquisition.cpp'],['test_amda_acquisition'],['AMDA Acquisition test']]
+              [['tests/TestAmdaAcquisition.cpp'],'test_amda_acquisition','AMDA Acquisition test']
             ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
               test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
                                       link_with : [sciqlop_core, sciqlop_amdaplugin, sciqlop_gui],
                                       include_directories : [core_inc, amdaplugin_inc, gui_inc],
                                       cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
                                       dependencies : [qt5core, qt5widgets, qt5network,qt5test])
-              test(unit_test[2], test_exe,timeout: 3 * 60)
+              test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
             endforeach

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages