Skip to content

Commit 41803a7

Browse files
committed
Add missing updates pointed out by rabbit.
1 parent 3f5ac82 commit 41803a7

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

taskfiles/lint-cpp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ tasks:
7676
vars:
7777
FLAGS:
7878
- "--config-file '{{.ROOT_DIR}}/.clang-tidy'"
79-
- "-p '{{.G_YSTDLIB_BUILD_DIR}}/debug/compile_commands.json'"
79+
- "-p '{{.G_YSTDLIB_DEBUG_BUILD_DIR}}/compile_commands.json'"
8080
OUTPUT_DIR: "{{.G_LINT_CLANG_TIDY_DIR}}"
8181
ROOT_PATHS: ["{{.G_CPP_SRC_DIR}}"]
8282
VENV_DIR: "{{.G_LINT_VENV_DIR}}"

taskfiles/test.yaml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ includes:
55
internal: true
66
taskfile: "ystdlib.yaml"
77

8+
vars:
9+
G_UNIT_TEST_ALL: "testbin/unit-test-all"
10+
811
tasks:
912
run-debug:
1013
# The name ystdlib_LIBRARIES should match its CMakeLists.txt equivalent for consistency.
@@ -13,9 +16,10 @@ tasks:
1316
ystdlib_LIBRARIES is defined, only configure and build the listed libraries and their internal
1417
dependencies.
1518
cmds:
16-
- task: "run-unit-test"
19+
- task: "ystdlib:build-debug"
1720
vars:
18-
BUILD_TYPE: "debug"
21+
ystdlib_LIBRARIES: "{{.ystdlib_LIBRARIES}}"
22+
- "{{.G_YSTDLIB_DEBUG_BUILD_DIR}}/{{.G_UNIT_TEST_ALL}}"
1923

2024
run-release:
2125
# The name ystdlib_LIBRARIES should match its CMakeLists.txt equivalent for consistency.
@@ -24,16 +28,7 @@ tasks:
2428
ystdlib_LIBRARIES is defined, only configure and build the listed libraries and their internal
2529
dependencies.
2630
cmds:
27-
- task: "run-unit-test"
28-
vars:
29-
BUILD_TYPE: "release"
30-
31-
run-unit-test:
32-
internal: true
33-
requires:
34-
vars: ["BUILD_TYPE"]
35-
deps:
36-
- task: "ystdlib:build-{{.BUILD_TYPE}}"
31+
- task: "ystdlib:build-release"
3732
vars:
3833
ystdlib_LIBRARIES: "{{.ystdlib_LIBRARIES}}"
39-
cmd: "{{.G_YSTDLIB_BUILD_DIR}}/{{.BUILD_TYPE}}/testbin/unit-test-all"
34+
- "{{.G_YSTDLIB_RELEASE_BUILD_DIR}}/{{.G_UNIT_TEST_ALL}}"

taskfiles/ystdlib.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ tasks:
2222
vars:
2323
BUILD_DIR: "{{.BUILD_DIR}}"
2424
BUILD_TYPE: "debug"
25+
LIBRARIES: "{{.ystdlib_LIBRARIES}}"
2526
- task: "utils:cmake:build"
2627
vars:
2728
BUILD_DIR: "{{.BUILD_DIR}}"

0 commit comments

Comments
 (0)