Skip to content

Commit 8d5ee1c

Browse files
vifergaviferga
committed
Add dependencies for tests, some of them are not implemented due to lack of support of generator expressions to add_dependencies command.
1 parent 627454e commit 8d5ee1c

File tree

68 files changed

+631
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+631
-11
lines changed

‎source/benchmarks/metacall_cs_call_bench/CMakeLists.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Check if this loader is enabled
2+
if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_CS)
3+
return()
4+
endif()
5+
16
#
27
# Executable name and options
38
#
@@ -117,6 +122,14 @@ add_test(NAME ${target}
117122
COMMAND $<TARGET_FILE:${target}>
118123
)
119124

125+
#
126+
# Define dependencies
127+
#
128+
129+
add_dependencies(${target}
130+
cs_loader
131+
)
132+
120133
#
121134
# Define test properties
122135
#

‎source/benchmarks/metacall_node_call_bench/CMakeLists.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Check if this loader is enabled
2+
if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_NODE)
3+
return()
4+
endif()
5+
16
#
27
# Executable name and options
38
#
@@ -117,6 +122,14 @@ add_test(NAME ${target}
117122
COMMAND $<TARGET_FILE:${target}>
118123
)
119124

125+
#
126+
# Define dependencies
127+
#
128+
129+
add_dependencies(${target}
130+
node_loader
131+
)
132+
120133
#
121134
# Define test properties
122135
#

‎source/benchmarks/metacall_py_call_bench/CMakeLists.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Check if this loader is enabled
2+
if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_PY)
3+
return()
4+
endif()
5+
16
#
27
# Executable name and options
38
#
@@ -117,6 +122,14 @@ add_test(NAME ${target}
117122
COMMAND $<TARGET_FILE:${target}>
118123
)
119124

125+
#
126+
# Define dependencies
127+
#
128+
129+
add_dependencies(${target}
130+
py_loader
131+
)
132+
120133
#
121134
# Define test properties
122135
#

‎source/benchmarks/metacall_py_init_bench/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,14 @@ add_test(NAME ${target}
117117
COMMAND $<TARGET_FILE:${target}>
118118
)
119119

120+
#
121+
# Define dependencies
122+
#
123+
124+
add_dependencies(${target}
125+
py_loader
126+
)
127+
120128
#
121129
# Define test properties
122130
#

‎source/benchmarks/metacall_rb_call_bench/CMakeLists.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Check if this loader is enabled
2+
if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_RB)
3+
return()
4+
endif()
5+
16
#
27
# Executable name and options
38
#
@@ -117,6 +122,14 @@ add_test(NAME ${target}
117122
COMMAND $<TARGET_FILE:${target}>
118123
)
119124

125+
#
126+
# Define dependencies
127+
#
128+
129+
add_dependencies(${target}
130+
rb_loader
131+
)
132+
120133
#
121134
# Define test properties
122135
#

‎source/cli/metacallcli/CMakeLists.txt‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ add_custom_target(${target}-scripts-tests ALL
7575
COMMAND ${CMAKE_COMMAND} -E make_directory ${LOADER_SCRIPT_PATH}
7676
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/test/ ${LOADER_SCRIPT_PATH}/
7777
COMMAND ${CMAKE_COMMAND} -DPROJECT_METACALL_PORTS_DIRECTORY=${PROJECT_METACALL_PORTS_DIRECTORY} -DLOADER_SCRIPT_PATH=${LOADER_SCRIPT_PATH} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/configure_tests.cmake
78-
)
79-
78+
)
79+
8080
set_target_properties(${target}-scripts-tests
8181
PROPERTIES
8282
${DEFAULT_PROJECT_OPTIONS}
@@ -181,6 +181,23 @@ add_test(NAME ${target}
181181
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
182182
)
183183

184+
#
185+
# Define dependencies
186+
#
187+
188+
# TODO: Generator expressions do not work in add_dependencies
189+
# add_dependencies(${target}
190+
# $<$<BOOL:${OPTION_BUILD_LOADERS_NODE}>:node_loader>
191+
# $<$<BOOL:${OPTION_BUILD_LOADERS_PY}>:py_loader>
192+
# $<$<BOOL:${OPTION_BUILD_LOADERS_RB}>:rb_loader>
193+
# $<$<BOOL:${OPTION_BUILD_LOADERS_CS}>:cs_loader>
194+
# $<$<BOOL:${OPTION_BUILD_LOADERS_JSM}>:jsm_loader>
195+
# $<$<BOOL:${OPTION_BUILD_LOADERS_JS}>:js_loader>
196+
# $<$<BOOL:${OPTION_BUILD_LOADERS_MOCK}>:mock_loader>
197+
# $<$<BOOL:${OPTION_BUILD_LOADERS_C}>:c_loader>
198+
# $<$<BOOL:${OPTION_BUILD_LOADERS_FILE}>:file_loader>
199+
# )
200+
184201
#
185202
# Define test labels
186203
#

‎source/scripts/ruby/hello/source/hello.rb‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,18 @@ def say_multiply(left: Fixnum, right: Fixnum)
1212
return result
1313
end
1414

15+
def say_multiply_ducktyped(left, right)
16+
result = left * right
17+
puts('Multiply', result, '!')
18+
return result
19+
end
20+
21+
def say_sum_ducktyped(left, right)
22+
result = left + right
23+
puts('Sum', result, '!')
24+
return result
25+
end
26+
1527
def say_null()
1628
puts('Helloooo from null method!')
1729
end

‎source/tests/cs_loader_test/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,14 @@ add_test(NAME ${target}
130130
COMMAND $<TARGET_FILE:${target}>
131131
)
132132

133+
#
134+
# Define dependencies
135+
#
136+
137+
add_dependencies(${target}
138+
cs_loader
139+
)
140+
133141
#
134142
# Define test properties
135143
#

‎source/tests/file_loader_test/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,14 @@ add_test(NAME ${target}
130130
COMMAND $<TARGET_FILE:${target}>
131131
)
132132

133+
#
134+
# Define dependencies
135+
#
136+
137+
add_dependencies(${target}
138+
file_loader
139+
)
140+
133141
#
134142
# Define test properties
135143
#

‎source/tests/metacall_callback_complex_test/CMakeLists.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,15 @@ add_test(NAME ${target}
123123
COMMAND $<TARGET_FILE:${target}>
124124
)
125125

126+
#
127+
# Define dependencies
128+
#
129+
130+
add_dependencies(${target}
131+
py_loader
132+
node_loader
133+
)
134+
126135
#
127136
# Define test properties
128137
#

0 commit comments

Comments
 (0)