Skip to content

Commit 74d9062

Browse files
starseekerstarseeker
committed
Start making some fixes to tests
1 parent 9eb23dc commit 74d9062

5 files changed

Lines changed: 21 additions & 31 deletions

File tree

‎src/clstepcore/test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
22
#c++ tests for clstepcore
33

44
include_directories(

‎src/express/test/CMakeLists.txt‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,17 @@ if(SC_GENERATE_LP_SOURCES)
44
include_directories("${PERPLEX_ExpScanner_INCLUDE_DIR}" "${LEMON_ExpParser_INCLUDE_DIR}")
55
endif(SC_GENERATE_LP_SOURCES)
66

7-
set(EXPRESS_CORE_OBJ
8-
# base
9-
$<TARGET_OBJECTS:objlib_alloc_c>
10-
$<TARGET_OBJECTS:objlib_memory_c>
11-
$<TARGET_OBJECTS:objlib_hash_c>
12-
$<TARGET_OBJECTS:objlib_linklist_c>
13-
14-
# global tables
15-
$<TARGET_OBJECTS:objlib_object_c>
16-
$<TARGET_OBJECTS:objlib_error_c>
17-
18-
# AST creation
19-
$<TARGET_OBJECTS:objlib_factory_c>
20-
$<TARGET_OBJECTS:objlib_stmt_c>
21-
$<TARGET_OBJECTS:objlib_alg_c>
22-
23-
# deprecated
24-
$<TARGET_OBJECTS:objlib_dict_c>
25-
$<TARGET_OBJECTS:objlib_info_c>
26-
)
27-
28-
add_executable(test_expr driver.c test_expr.c $<TARGET_OBJECTS:objlib_expr_c> ${EXPRESS_CORE_OBJ})
7+
add_executable(test_expr driver.c test_expr.c)
8+
target_link_libraries(test_expr express)
299
add_test(NAME exp_resolve_select_enum_member COMMAND test_expr resolve_select_enum_member)
3010
add_test(NAME exp_resolve_entity_attribute COMMAND test_expr resolve_entity_attribute)
3111

32-
add_executable(test_express driver.c test_express.c $<TARGET_OBJECTS:objlib_express_c> ${EXPRESS_CORE_OBJ})
12+
add_executable(test_express driver.c test_express.c)
13+
target_link_libraries(test_express express)
3314
add_test(NAME express_rename_resolve COMMAND test_express express_rename_resolve)
3415

35-
add_executable(test_resolve driver.c test_resolve.c $<TARGET_OBJECTS:objlib_resolve_c> ${EXPRESS_CORE_OBJ})
16+
add_executable(test_resolve driver.c test_resolve.c)
17+
target_link_libraries(test_resolve express)
3618

3719
add_test(NAME exp_resolve_bad_func_call COMMAND test_resolve exp_resolve_bad_func_call)
3820
add_test(NAME exp_resolve_func_call COMMAND test_resolve exp_resolve_func_call)
@@ -43,20 +25,24 @@ add_test(NAME stmt_resolve_pcall_proc COMMAND test_resolve stmt_resolve_pcall_pr
4325
add_test(NAME scope_resolve_named_types COMMAND test_resolve scope_resolve_named_types)
4426
add_test(NAME entity_resolve_supertypes_entity COMMAND test_resolve entity_resolve_supertypes_entity)
4527

46-
add_executable(test_resolve2 driver.c test_resolve2.c $<TARGET_OBJECTS:objlib_resolve2_c> ${EXPRESS_CORE_OBJ})
28+
add_executable(test_resolve2 driver.c test_resolve2.c)
29+
target_link_libraries(test_resolve2 express)
4730
add_test(NAME scope_resolve_expr_stmt COMMAND test_resolve2 scope_resolve_expr_stmt)
4831
add_test(NAME scope_resolve_subsupers COMMAND test_resolve2 scope_resolve_subsupers)
4932

50-
add_executable(test_schema driver.c test_schema.c $<TARGET_OBJECTS:objlib_schema_c> ${EXPRESS_CORE_OBJ})
33+
add_executable(test_schema driver.c test_schema.c)
34+
target_link_libraries(test_schema express)
5135
add_test(NAME schema_define_ref COMMAND test_schema schema_define_ref)
5236
add_test(NAME schema_define_use COMMAND test_schema schema_define_use)
5337
add_test(NAME schema_get_entities_ref COMMAND test_schema schema_get_entities_ref)
5438
add_test(NAME var_find COMMAND test_schema var_find)
5539

56-
add_executable(test_scope driver.c test_scope.c $<TARGET_OBJECTS:objlib_scope_c> ${EXPRESS_CORE_OBJ})
40+
add_executable(test_scope driver.c test_scope.c)
41+
target_link_libraries(test_scope express)
5742
add_test(NAME scope_find COMMAND test_scope scope_find)
5843

59-
add_executable(test_type driver.c test_type.c $<TARGET_OBJECTS:objlib_type_c> ${EXPRESS_CORE_OBJ})
44+
add_executable(test_type driver.c test_type.c)
45+
target_link_libraries(test_type express)
6046
add_test(NAME type_create_user_defined_tag COMMAND test_type type_create_user_defined_tag)
6147

6248
add_test(NAME build_check_express

‎test/cpp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
22

33
#c++ tests
44

‎test/cpp/schema_specific/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ include_directories( ${SC_SOURCE_DIR}/src/cldai ${SC_SOURCE_DIR}/src/cleditor ${
99
# added as a workaround for changed behavior in newer cmake
1010
# versions (changes somewhere between 2.8 and 3.1)
1111
function(get_sdai_incl_dir out_path_var sdai_lib)
12+
if (NOT TARGET sdai_${sdai_lib})
13+
message("sdai_${sdai_lib} is not a target")
14+
return()
15+
endif (NOT TARGET sdai_${sdai_lib})
1216
if(NOT "${sdai_${sdai_lib}_SOURCE_DIR}" STREQUAL "")
1317
set(${out_path_var} "${sdai_${sdai_lib}_SOURCE_DIR}" PARENT_SCOPE)
1418
return()

‎test/p21/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
22
#test part 21 files
33

44
#necessary macros won't already be defined if SC_BUILD_SCHEMAS is set to ""

0 commit comments

Comments
 (0)