##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Merge pull request 237 from SCIQLOP develop...
perrinel -
r593:4f5a18bbe2b7 merge
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,12 +1,12
1
1
2
2
3 tests = [
3 tests = [
4 [['Data/TestDataSeries.cpp'],['test_data'],['DataSeries test']],
4 [['Data/TestDataSeries.cpp'],'test_data','DataSeries test'],
5 [['Data/TestOneDimArrayData.cpp'],['test_1d'],['One Dim Array test']],
5 [['Data/TestOneDimArrayData.cpp'],'test_1d','One Dim Array test'],
6 [['Data/TestTwoDimArrayData.cpp'],['test_2d'],['Two Dim Array test']],
6 [['Data/TestTwoDimArrayData.cpp'],'test_2d','Two Dim Array test'],
7 [['DataSource/TestDataSourceController.cpp'],['test_data_source'],['DataSourceController test']],
7 [['DataSource/TestDataSourceController.cpp'],'test_data_source','DataSourceController test'],
8 [['Variable/TestVariableCacheController.cpp'],['test_variable_cache'],['VariableCacheController test']],
8 [['Variable/TestVariableCacheController.cpp'],'test_variable_cache','VariableCacheController test'],
9 [['Variable/TestVariable.cpp'],['test_variable'],['Variable test']]
9 [['Variable/TestVariable.cpp'],'test_variable','Variable test']
10 ]
10 ]
11
11
12 foreach unit_test : tests
12 foreach unit_test : tests
@@ -15,6 +15,6 foreach unit_test : tests
15 link_with : sciqlop_core,
15 link_with : sciqlop_core,
16 include_directories : core_inc,
16 include_directories : core_inc,
17 dependencies : [qt5core, qt5widgets, qt5network,qt5test])
17 dependencies : [qt5core, qt5widgets, qt5network,qt5test])
18 test(unit_test[2], test_exe)
18 test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])])
19 endforeach
19 endforeach
20
20
Show file before | Show file after | Hide comments
@@ -30,7 +30,6 cppcheck = find_program('cppcheck', required : false)
30 if cppcheck.found()
30 if cppcheck.found()
31 run_target('cppcheck',
31 run_target('cppcheck',
32 command : [cppcheck, '--enable=all',
32 command : [cppcheck, '--enable=all',
33 '--project=' + join_paths(meson.build_root(), 'compile_commands.json')],
33 '--project=' + join_paths(meson.build_root(), 'compile_commands.json')]
34 build_by_default : true
35 )
34 )
36 endif
35 endif
Show file before | Show file after | Hide comments
@@ -45,9 +45,9 sciqlop_amdaplugin = library('amdaplugin',
45
45
46
46
47 tests = [
47 tests = [
48 [['tests/TestAmdaParser.cpp'],['test_amda_parser'],['AMDA parser test']],
48 [['tests/TestAmdaParser.cpp'],'test_amda_parser','AMDA parser test'],
49 [['tests/TestAmdaResultParser.cpp'],['test_amda_result_parser'],['AMDA result parser test']],
49 [['tests/TestAmdaResultParser.cpp'],'test_amda_result_parser','AMDA result parser test'],
50 [['tests/TestAmdaAcquisition.cpp'],['test_amda_acquisition'],['AMDA Acquisition test']]
50 [['tests/TestAmdaAcquisition.cpp'],'test_amda_acquisition','AMDA Acquisition test']
51 ]
51 ]
52
52
53 foreach unit_test : tests
53 foreach unit_test : tests
@@ -57,5 +57,5 foreach unit_test : tests
57 include_directories : [core_inc, amdaplugin_inc, gui_inc],
57 include_directories : [core_inc, amdaplugin_inc, gui_inc],
58 cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
58 cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
59 dependencies : [qt5core, qt5widgets, qt5network,qt5test])
59 dependencies : [qt5core, qt5widgets, qt5network,qt5test])
60 test(unit_test[2], test_exe,timeout: 3 * 60)
60 test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
61 endforeach
61 endforeach
General Comments 3
Under Review
perrinel
author
Comment #1958
Edit
Delete
|

Auto status change to "Under Review"

Approved
perrinel
author
Comment #1959
Edit
Delete
|

Status change > Approved

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