From 4f5a18bbe2b7b2c945daf64d19afe5521907e705 2017-08-24 12:12:30
From: perrinel <mperrinel@itlink.fr>
Date: 2017-08-24 12:12:30
Subject: [PATCH] Merge pull request #237 from SCIQLOP develop

 Some Meson improvements.

---

diff --git a/core/tests/meson.build b/core/tests/meson.build
index 607c2e2..d9ec423 100644
--- a/core/tests/meson.build
+++ b/core/tests/meson.build
@@ -1,12 +1,12 @@
 
 
 tests = [
-  [['Data/TestDataSeries.cpp'],['test_data'],['DataSeries test']],
-  [['Data/TestOneDimArrayData.cpp'],['test_1d'],['One Dim Array test']],
-  [['Data/TestTwoDimArrayData.cpp'],['test_2d'],['Two Dim Array test']],
-  [['DataSource/TestDataSourceController.cpp'],['test_data_source'],['DataSourceController test']],
-  [['Variable/TestVariableCacheController.cpp'],['test_variable_cache'],['VariableCacheController test']],
-  [['Variable/TestVariable.cpp'],['test_variable'],['Variable test']]
+  [['Data/TestDataSeries.cpp'],'test_data','DataSeries test'],
+  [['Data/TestOneDimArrayData.cpp'],'test_1d','One Dim Array test'],
+  [['Data/TestTwoDimArrayData.cpp'],'test_2d','Two Dim Array test'],
+  [['DataSource/TestDataSourceController.cpp'],'test_data_source','DataSourceController test'],
+  [['Variable/TestVariableCacheController.cpp'],'test_variable_cache','VariableCacheController test'],
+  [['Variable/TestVariable.cpp'],'test_variable','Variable test']
 ]
 
 foreach unit_test : tests
@@ -15,6 +15,6 @@ foreach unit_test : tests
                           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
 
diff --git a/meson.build b/meson.build
index 58abfea..5550f31 100644
--- a/meson.build
+++ b/meson.build
@@ -30,7 +30,6 @@ 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')],
-              build_by_default : true
+              '--project=' + join_paths(meson.build_root(), 'compile_commands.json')]
               )
 endif
diff --git a/plugins/amda/meson.build b/plugins/amda/meson.build
index 4cdede5..489770a 100644
--- a/plugins/amda/meson.build
+++ b/plugins/amda/meson.build
@@ -45,9 +45,9 @@ sciqlop_amdaplugin = library('amdaplugin',
 
 
 tests = [
-  [['tests/TestAmdaParser.cpp'],['test_amda_parser'],['AMDA parser test']],
-  [['tests/TestAmdaResultParser.cpp'],['test_amda_result_parser'],['AMDA result parser test']],
-  [['tests/TestAmdaAcquisition.cpp'],['test_amda_acquisition'],['AMDA Acquisition test']]
+  [['tests/TestAmdaParser.cpp'],'test_amda_parser','AMDA parser test'],
+  [['tests/TestAmdaResultParser.cpp'],'test_amda_result_parser','AMDA result parser test'],
+  [['tests/TestAmdaAcquisition.cpp'],'test_amda_acquisition','AMDA Acquisition test']
 ]
 
 foreach unit_test : tests
@@ -57,5 +57,5 @@ foreach unit_test : tests
                           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