Skip to content

Commit 5916be7

Browse files
stanislav-shchetininstanislav-shchetinin
committed
added labels for tests & devided test groups by labels
1 parent 148cded commit 5916be7

File tree

32 files changed

+157
-6
lines changed

32 files changed

+157
-6
lines changed

‎.github/workflows/tests.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ jobs:
6161
group: integration-${{ github.ref }}-${{ matrix.os }}-${{ matrix.go-version }}-${{ matrix.ydb-version }}
6262
cancel-in-progress: true
6363
runs-on: ubuntu-latest
64-
env:
65-
ENDPOINT: "localhost:2136"
66-
DATABASE: "/local"
6764
strategy:
6865
fail-fast: false
6966
matrix:

‎CMakePresets.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"displayName": "Default Unit Release Tests",
6868
"filter" : {
6969
"include": {
70-
"name": ".*_ut"
70+
"label": "unit"
7171
}
7272
},
7373
"output": {
@@ -86,11 +86,15 @@
8686
},
8787
"filter" : {
8888
"include": {
89-
"name": ".*_it"
89+
"label": "integration"
9090
}
9191
},
9292
"execution": {
9393
"timeout": 1200
94+
},
95+
"environment": {
96+
"ENDPOINT": "localhost:2136",
97+
"DATABASE": "/local"
9498
}
9599
}
96100
]

‎cmake/testing.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ endfunction()
6060
function(add_ydb_test)
6161
set(opts "")
6262
set(oneval_args NAME)
63-
set(multival_args INCLUDE_DIRS SOURCES LINK_LIBRARIES)
63+
set(multival_args INCLUDE_DIRS SOURCES LINK_LIBRARIES LABELS)
6464
cmake_parse_arguments(YDB_TEST
6565
"${opts}"
6666
"${oneval_args}"
@@ -72,6 +72,7 @@ function(add_ydb_test)
7272
target_include_directories(${YDB_TEST_NAME} PRIVATE ${YDB_TEST_INCLUDE_DIRS})
7373
target_link_libraries(${YDB_TEST_NAME} PRIVATE ${YDB_TEST_LINK_LIBRARIES})
7474
target_sources(${YDB_TEST_NAME} PRIVATE ${YDB_TEST_SOURCES})
75+
#set_tests_properties(${YDB_TEST_NAME} PROPERTIES LABELS "${YDB_TEST_LABELS}")
7576

7677
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
7778
target_link_libraries(${YDB_TEST_NAME} PRIVATE
@@ -121,6 +122,7 @@ function(add_ydb_test)
121122
PROPERTY
122123
LABELS
123124
MEDIUM
125+
${YDB_TEST_LABELS}
124126
)
125127

126128
set_yunittest_property(

‎tests/integration/basic_example_it/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ add_ydb_test(NAME basic-example_it
99
library-getopt
1010
YDB-CPP-SDK::Table
1111
GTest::gtest_main
12+
LABELS
13+
integration
1214
)

‎tests/ut/client/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ add_ydb_test(NAME client-ydb_coordination_ut
88
cpp-testing-unittest_main
99
YDB-CPP-SDK::Coordination
1010
api-grpc
11+
LABELS
12+
unit
1113
)
1214

1315
add_ydb_test(NAME client-extensions-discovery_mutator_ut
@@ -18,6 +20,8 @@ add_ydb_test(NAME client-extensions-discovery_mutator_ut
1820
cpp-testing-unittest_main
1921
YDB-CPP-SDK::DiscoveryMutator
2022
YDB-CPP-SDK::Table
23+
LABELS
24+
unit
2125
)
2226

2327
add_ydb_test(NAME client-ydb_driver_ut
@@ -28,6 +32,8 @@ add_ydb_test(NAME client-ydb_driver_ut
2832
cpp-testing-unittest_main
2933
YDB-CPP-SDK::Driver
3034
YDB-CPP-SDK::Table
35+
LABELS
36+
unit
3137
)
3238

3339
add_ydb_test(NAME client-impl-ydb_endpoints_ut
@@ -39,6 +45,8 @@ add_ydb_test(NAME client-impl-ydb_endpoints_ut
3945
yutil
4046
cpp-testing-unittest_main
4147
client-impl-ydb_endpoints
48+
LABELS
49+
unit
4250
)
4351

4452
add_ydb_test(NAME client-ydb_params_ut
@@ -49,6 +57,8 @@ add_ydb_test(NAME client-ydb_params_ut
4957
cpp-testing-unittest_main
5058
YDB-CPP-SDK::Params
5159
YDB-CPP-SDK::YsonValue
60+
LABELS
61+
unit
5262
)
5363

5464
add_ydb_test(NAME client-ydb_result_ut
@@ -59,6 +69,8 @@ add_ydb_test(NAME client-ydb_result_ut
5969
cpp-testing-unittest_main
6070
YDB-CPP-SDK::Result
6171
YDB-CPP-SDK::Params
72+
LABELS
73+
unit
6274
)
6375

6476
add_ydb_test(NAME client-ydb_value_ut
@@ -71,6 +83,8 @@ add_ydb_test(NAME client-ydb_value_ut
7183
YDB-CPP-SDK::JsonValue
7284
YDB-CPP-SDK::YsonValue
7385
YDB-CPP-SDK::Params
86+
LABELS
87+
unit
7488
)
7589

7690
add_ydb_test(NAME client-draft_ut
@@ -80,4 +94,6 @@ add_ydb_test(NAME client-draft_ut
8094
yutil
8195
cpp-testing-unittest_main
8296
YDB-CPP-SDK::Draft
97+
LABELS
98+
unit
8399
)

‎tests/ut/client/oauth2_token_exchange/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ add_ydb_test(NAME client-oauth2_ut
77
cpp-testing-unittest_main
88
library-http-server
99
client-ydb_types-credentials-oauth2
10+
LABELS
11+
unit
1012
)

‎tests/ut/json_value/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ add_ydb_test(NAME json_value_ut
99
cpp-testing-unittest
1010
YDB-CPP-SDK::Proto
1111
YDB-CPP-SDK::Params
12+
LABELS
13+
unit
1214
)

‎tests/ut/library/cache/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ add_ydb_test(NAME cache-cache_ut
55
yutil
66
cpp-testing-unittest_main
77
library-cache
8+
LABELS
9+
unit
810
)

‎tests/ut/library/case_insensitive_string/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ add_ydb_test(NAME library-case_insensitive_string_ut
66
LINK_LIBRARIES
77
library-case_insensitive_string
88
cpp-testing-unittest_main
9+
LABELS
10+
unit
911
)

‎tests/ut/library/cgiparam/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ add_ydb_test(NAME library-cgiparam_ut
44
LINK_LIBRARIES
55
library-cgiparam
66
cpp-testing-unittest_main
7+
LABELS
8+
unit
79
)

‎tests/ut/library/charset/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ add_ydb_test(NAME library-charset-ci_string_ut
66
LINK_LIBRARIES
77
library-charset-lite
88
cpp-testing-unittest_main
9+
LABELS
10+
unit
911
)
1012

1113
add_ydb_test(NAME library-charset-codepage_ut
@@ -16,6 +18,8 @@ add_ydb_test(NAME library-charset-codepage_ut
1618
LINK_LIBRARIES
1719
library-charset
1820
cpp-testing-unittest_main
21+
LABELS
22+
unit
1923
)
2024

2125
add_ydb_test(NAME library-charset-iconv_ut
@@ -26,6 +30,8 @@ add_ydb_test(NAME library-charset-iconv_ut
2630
LINK_LIBRARIES
2731
library-charset
2832
cpp-testing-unittest_main
33+
LABELS
34+
unit
2935
)
3036

3137
add_ydb_test(NAME library-charset-recyr_int_ut
@@ -36,6 +42,8 @@ add_ydb_test(NAME library-charset-recyr_int_ut
3642
LINK_LIBRARIES
3743
library-charset
3844
cpp-testing-unittest_main
45+
LABELS
46+
unit
3947
)
4048

4149
add_ydb_test(NAME library-charset-wide_ut
@@ -46,4 +54,6 @@ add_ydb_test(NAME library-charset-wide_ut
4654
LINK_LIBRARIES
4755
library-charset
4856
cpp-testing-unittest_main
57+
LABELS
58+
unit
4959
)

‎tests/ut/library/containers/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ add_ydb_test(NAME library-containers-disjoint_interval_tree_ut
66
LINK_LIBRARIES
77
containers-disjoint_interval_tree
88
cpp-testing-unittest_main
9+
LABELS
10+
unit
911
)
1012

1113
add_ydb_test(NAME library-containers-intrusive_rb_tree_ut
@@ -16,6 +18,8 @@ add_ydb_test(NAME library-containers-intrusive_rb_tree_ut
1618
LINK_LIBRARIES
1719
containers-intrusive_rb_tree
1820
cpp-testing-unittest_main
21+
LABELS
22+
unit
1923
)
2024

2125
add_ydb_test(NAME library-containers-paged_vector_ut
@@ -26,6 +30,8 @@ add_ydb_test(NAME library-containers-paged_vector_ut
2630
LINK_LIBRARIES
2731
containers-paged_vector
2832
cpp-testing-unittest_main
33+
LABELS
34+
unit
2935
)
3036

3137
add_ydb_test(NAME library-containers-stack_vector_ut
@@ -34,4 +40,6 @@ add_ydb_test(NAME library-containers-stack_vector_ut
3440
LINK_LIBRARIES
3541
containers-stack_vector
3642
cpp-testing-unittest_main
43+
LABELS
44+
unit
3745
)

‎tests/ut/library/coroutine/engine/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ add_ydb_test(NAME library-coroutine-engine-coroutine_ut
66
LINK_LIBRARIES
77
library-coroutine-engine
88
cpp-testing-unittest_main
9+
LABELS
10+
unit
911
)
1012

1113
add_subdirectory(stack)

‎tests/ut/library/coroutine/engine/stack/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ add_ydb_test(NAME library-coroutine-engine-stack-stack_allocator_ut
66
LINK_LIBRARIES
77
library-coroutine-engine
88
cpp-testing-gtest_main
9+
LABELS
10+
unit
911
)
1012

1113
add_ydb_test(NAME library-coroutine-engine-stack-stack_guards_ut
@@ -16,6 +18,8 @@ add_ydb_test(NAME library-coroutine-engine-stack-stack_guards_ut
1618
LINK_LIBRARIES
1719
library-coroutine-engine
1820
cpp-testing-gtest_main
21+
LABELS
22+
unit
1923
)
2024

2125
add_ydb_test(NAME library-coroutine-engine-stack-stack_pool_ut
@@ -26,6 +30,8 @@ add_ydb_test(NAME library-coroutine-engine-stack-stack_pool_ut
2630
LINK_LIBRARIES
2731
library-coroutine-engine
2832
cpp-testing-gtest_main
33+
LABELS
34+
unit
2935
)
3036

3137
add_ydb_test(NAME library-coroutine-engine-stack-stack_ut
@@ -36,6 +42,8 @@ add_ydb_test(NAME library-coroutine-engine-stack-stack_ut
3642
LINK_LIBRARIES
3743
library-coroutine-engine
3844
cpp-testing-gtest_main
45+
LABELS
46+
unit
3947
)
4048

4149
add_ydb_test(NAME library-coroutine-engine-stack-stack_utils_ut
@@ -46,4 +54,6 @@ add_ydb_test(NAME library-coroutine-engine-stack-stack_utils_ut
4654
LINK_LIBRARIES
4755
library-coroutine-engine
4856
cpp-testing-gtest_main
57+
LABELS
58+
unit
4959
)

‎tests/ut/library/dbg_output/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ add_ydb_test(NAME library-dbg_output-dbg_output_ut
88
yutil
99
library-dbg_output
1010
cpp-testing-unittest_main
11+
LABELS
12+
unit
1113
)

‎tests/ut/library/diff/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ add_ydb_test(NAME library-diff_ut
66
LINK_LIBRARIES
77
library-diff
88
cpp-testing-unittest_main
9+
LABELS
10+
unit
911
)

‎tests/ut/library/digest/lower_case/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ add_ydb_test(NAME library-digest-lower_case-hash_ops_ut
66
LINK_LIBRARIES
77
digest-lower_case
88
cpp-testing-unittest_main
9+
LABELS
10+
unit
911
)
1012

1113
add_ydb_test(NAME library-digest-lower_case-lchash_ut
@@ -16,4 +18,6 @@ add_ydb_test(NAME library-digest-lower_case-lchash_ut
1618
LINK_LIBRARIES
1719
digest-lower_case
1820
cpp-testing-unittest_main
21+
LABELS
22+
unit
1923
)

‎tests/ut/library/digest/md5/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ add_ydb_test(NAME library-digest-md5_medium_ut
88
yutil
99
digest-md5
1010
cpp-testing-unittest_main
11+
LABELS
12+
unit
1113
)
1214

1315
add_ydb_test(NAME library-digest-md5_ut
@@ -20,4 +22,6 @@ add_ydb_test(NAME library-digest-md5_ut
2022
yutil
2123
digest-md5
2224
cpp-testing-unittest_main
25+
LABELS
26+
unit
2327
)

‎tests/ut/library/digest/murmur/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ add_ydb_test(NAME library-digest-murmur_ut
66
LINK_LIBRARIES
77
digest-murmur
88
cpp-testing-unittest_main
9+
LABELS
10+
unit
911
)

‎tests/ut/library/json/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ LINK_LIBRARIES
1010
yutil
1111
cpp-testing-unittest_main
1212
library-json
13+
LABELS
14+
unit
1315
)
1416

1517
add_ydb_test(NAME json-ut-json_reader_fast_ut
@@ -25,6 +27,8 @@ LINK_LIBRARIES
2527
yutil
2628
cpp-testing-unittest_main
2729
library-json
30+
LABELS
31+
unit
2832
)
2933

3034
add_ydb_test(NAME json-ut-json_reader_ut
@@ -39,6 +43,8 @@ LINK_LIBRARIES
3943
yutil
4044
cpp-testing-unittest_main
4145
library-json
46+
LABELS
47+
unit
4248
)
4349

4450
add_ydb_test(NAME json-ut-json_saveload_ut
@@ -53,6 +59,8 @@ LINK_LIBRARIES
5359
yutil
5460
cpp-testing-unittest_main
5561
library-json
62+
LABELS
63+
unit
5664
)
5765

5866
add_ydb_test(NAME json-ut-json_writer_ut
@@ -66,4 +74,6 @@ LINK_LIBRARIES
6674
yutil
6775
cpp-testing-unittest_main
6876
library-json
77+
LABELS
78+
unit
6979
)

0 commit comments

Comments
 (0)