##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Added fuzzy tests and small fixes on meson files...
jeandet -
r1333:f1b0e148bd5a
parent child
Show More
Side by Side Unified
Context file:
r1333:f1b0e148bd5a Loading diff...:
Show file before | Show file after | Hide comments
@@ -41,7 +41,7 core_sources = [
41 'src/DataSource/DataSourceItemAction.cpp',
41 'src/DataSource/DataSourceItemAction.cpp',
42 'src/DataSource/DataSourceItemMergeHelper.cpp',
42 'src/DataSource/DataSourceItemMergeHelper.cpp',
43 'src/Network/NetworkController.cpp',
43 'src/Network/NetworkController.cpp',
44 'src/Plugin/PluginManager.cpp',
44 'src/PluginManager/PluginManager.cpp',
45 'src/Settings/SqpSettingsDefs.cpp',
45 'src/Settings/SqpSettingsDefs.cpp',
46 'src/Time/TimeController.cpp',
46 'src/Time/TimeController.cpp',
47 'src/Variable/Variable.cpp',
47 'src/Variable/Variable.cpp',
@@ -53,7 +53,7 core_sources = [
53 'src/Visualization/VisualizationController.cpp'
53 'src/Visualization/VisualizationController.cpp'
54 ]
54 ]
55
55
56 core_inc = include_directories(['include', '../plugin/include'])
56 core_inc = include_directories(['include', 'include/Plugin'])
57
57
58 sciqlop_core_lib = library('sciqlopcore',
58 sciqlop_core_lib = library('sciqlopcore',
59 core_sources,
59 core_sources,
Show file before | Show file after | Hide comments
@@ -5,6 +5,15 FILE (GLOB_RECURSE amdaplugin_SRCS
5 resources/*.qrc
5 resources/*.qrc
6 )
6 )
7
7
8
9 set(AMDA_server_type hybrid CACHE STRING "AMDA server type selected at CMake configure time")
10
11 set(AMDA_SERVER_TYPE "hybrid;amdatest;localhost" CACHE STRING
12 "List of possible for AMDA server type")
13
14 set_property(CACHE AMDA_server_type PROPERTY STRINGS ${AMDA_SERVER_TYPE})
15 add_definitions(-DSCIQLOP_AMDA_SERVER="{AMDA_server_type}")
16
8 add_definitions(-DQT_PLUGIN)
17 add_definitions(-DQT_PLUGIN)
9 add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
18 add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
10 if(NOT BUILD_SHARED_LIBS)
19 if(NOT BUILD_SHARED_LIBS)
@@ -28,4 +37,4 add_definitions(-DAMDA_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-reso
28 declare_test(TestAmdaParser TestAmdaParser tests/TestAmdaParser.cpp "amdaplugin;Qt5::Test")
37 declare_test(TestAmdaParser TestAmdaParser tests/TestAmdaParser.cpp "amdaplugin;Qt5::Test")
29 declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParser.cpp "amdaplugin;Qt5::Test")
38 declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParser.cpp "amdaplugin;Qt5::Test")
30 declare_test(TestAmdaAcquisition TestAmdaAcquisition tests/TestAmdaAcquisition.cpp "amdaplugin;Qt5::Test")
39 declare_test(TestAmdaAcquisition TestAmdaAcquisition tests/TestAmdaAcquisition.cpp "amdaplugin;Qt5::Test")
31
40 declare_test(TestAmdaFuzzing TestAmdaFuzzing "tests/TestAmdaFuzzing.cpp;tests/FuzzingValidators.cpp;tests/FuzzingUtils.cpp;tests/FuzzingOperations.cpp;tests/FuzzingDefs.cpp" "amdaplugin;Qt5::Test")
Show file before | Show file after | Hide comments
@@ -20,14 +20,14 amdaplugin_resources_files = [
20 'resources/amdaresources.qrc'
20 'resources/amdaresources.qrc'
21 ]
21 ]
22
22
23 amdaplugin_inc = include_directories(['include', '../../plugin/include'])
23 amdaplugin_inc = include_directories(['include'])
24
24
25 moc_gen = generator(moc,
25 moc_gen = generator(moc,
26 output : 'moc_@BASENAME@.cpp',
26 output : 'moc_@BASENAME@.cpp',
27 arguments : ['@INPUT@',
27 arguments : ['@INPUT@',
28 '-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
28 '-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
29 '-I', meson.current_source_dir()+'/include',
29 '-I', meson.current_source_dir()+'/include',
30 '-I', meson.current_source_dir()+'/../../plugin/include',
30 '-I', meson.current_source_dir()+'/../../core/include/',
31 '-o', '@OUTPUT@'])
31 '-o', '@OUTPUT@'])
32
32
33 rcc_gen = generator(rcc,
33 rcc_gen = generator(rcc,
Show file before | Show file after | Hide comments
@@ -9,7 +9,7 mockplugin_sources = [
9 'src/MockPlugin.cpp'
9 'src/MockPlugin.cpp'
10 ]
10 ]
11
11
12 mockplugin_inc = include_directories(['include', '../../plugin/include'])
12 mockplugin_inc = include_directories(['include'])
13
13
14
14
15 gen = generator(moc,
15 gen = generator(moc,
@@ -17,7 +17,7 gen = generator(moc,
17 arguments : ['@INPUT@',
17 arguments : ['@INPUT@',
18 '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/mockplugin/resources/mockplugin.json"',
18 '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/mockplugin/resources/mockplugin.json"',
19 '-I', meson.current_source_dir()+'/include',
19 '-I', meson.current_source_dir()+'/include',
20 '-I', meson.current_source_dir()+'/../../plugin/include',
20 '-I', meson.current_source_dir()+'/../../core/include/',
21 '-o', '@OUTPUT@'])
21 '-o', '@OUTPUT@'])
22
22
23 mockplugin_moc_files = gen.process(mockplugin_moc_headers)
23 mockplugin_moc_files = gen.process(mockplugin_moc_headers)
@@ -43,4 +43,4 foreach unit_test : tests
43 cpp_args : ['-DMOCKPLUGIN_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
43 cpp_args : ['-DMOCKPLUGIN_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
44 dependencies : [sciqlop_core, sciqlop_gui, qt5test])
44 dependencies : [sciqlop_core, sciqlop_gui, qt5test])
45 test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
45 test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
46 endforeach No newline at end of file
46 endforeach
General Comments 0
You need to be logged in to leave comments. Login now