Skip to content

Commit 2662920

Browse files
committed
* Fix unit tests for windows
* update .gitignore for vscode
1 parent 9b801f8 commit 2662920

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
cmake-build-*/
22
build/
3-
.idea/
3+
4+
.vscode/
5+
.devcontainer/
6+
.cache/
7+
.idea/
8+
9+
compile_commands.json

tests/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ add_executable(pattern_language_tests
4646
target_include_directories(pattern_language_tests PRIVATE include)
4747
target_link_libraries(pattern_language_tests PRIVATE libpl libpl-gen fmt::fmt-header-only)
4848

49-
set_target_properties(pattern_language_tests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
49+
set_target_properties(pattern_language_tests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
5050

5151
add_custom_command(TARGET pattern_language_tests
5252
POST_BUILD
53-
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/test_data" ${CMAKE_BINARY_DIR})
53+
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/test_data" ${CMAKE_BINARY_DIR}/bin)
5454

5555
add_custom_command(TARGET pattern_language_tests
5656
POST_BUILD
57-
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/files/export/json.json" ${CMAKE_BINARY_DIR}/files/export/json.json)
57+
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/files/export/json.json" ${CMAKE_BINARY_DIR}/bin/files/export/json.json)
5858

5959
add_custom_command(TARGET pattern_language_tests
6060
POST_BUILD
61-
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}//files/export/yaml.yml" ${CMAKE_BINARY_DIR}/files/export/yaml.yml)
61+
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}//files/export/yaml.yml" ${CMAKE_BINARY_DIR}/bin/files/export/yaml.yml)
6262

6363
foreach (test IN LISTS AVAILABLE_TESTS)
64-
add_test(NAME "PatternLanguage/${test}" COMMAND pattern_language_tests "${test}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
64+
add_test(NAME "PatternLanguage/${test}" COMMAND pattern_language_tests "${test}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
6565
endforeach ()
6666
add_dependencies(unit_tests ${PROJECT_NAME})

0 commit comments

Comments
 (0)