MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates build.yml & moves TEST variable setup

develop
Josh Cooper 2022-11-13 12:43:21 -08:00
parent d03f93c0d7
commit b11b1c3d5f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build.yml vendored
Unescape Escape View File

@ -99,7 +99,10 @@ jobs:
- name: Run unit tests - name: Run unit tests
id: run_tests1 id: run_tests1
run: | run: |
exit build-ci/library/tests/test-library if build-ci/library/tests/test-library; then
exit 0
fi
exit 1
- name: Run lua tests - name: Run lua tests
id: run_tests2 id: run_tests2
run: | run: |

12
CMakeLists.txt
Unescape Escape View File

@ -394,6 +394,12 @@ else()
endif() endif()
endif() endif()
if(BUILD_TESTING)
message("BUILD TESTS: Core, Scripts")
set(BUILD_SCRIPT_TESTS ON FORCE)
set(BUILD_CORE_TESTS ON FORCE)
endif()
# Support linking against external tinyxml # Support linking against external tinyxml
# If we find an external tinyxml, set the DFHACK_TINYXML variable to "tinyxml" # If we find an external tinyxml, set the DFHACK_TINYXML variable to "tinyxml"
# Otherwise, set it to "dfhack-tinyxml" # Otherwise, set it to "dfhack-tinyxml"
@ -409,12 +415,6 @@ else()
set(DFHACK_TINYXML "dfhack-tinyxml") set(DFHACK_TINYXML "dfhack-tinyxml")
endif() endif()
if(BUILD_TESTING)
message("BUILD TESTS: Core, Scripts")
set(BUILD_SCRIPT_TESTS ON FORCE)
set(BUILD_CORE_TESTS ON FORCE)
endif()
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
if(BUILD_CORE_TESTS) if(BUILD_CORE_TESTS)