Skip to content

Commit 3d36264

Browse files
PataterPatater
authored
Merge pull request #14944 from rwalton-arm/fix_ctest_reporting
CMake: unittests: Show all tests in CTest report
2 parents 862a942 + 98e25f1 commit 3d36264

File tree

50 files changed

+170
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+170
-159
lines changed

‎connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME cellular-framework-common-list-unittest)
57

68
add_executable(${TEST_NAME})
@@ -16,6 +18,4 @@ target_link_libraries(${TEST_NAME}
1618
gmock_main
1719
)
1820

19-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
20-
21-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
21+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

‎connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME cellular-framework-common-util-unittest)
57

68
add_executable(${TEST_NAME})
@@ -19,6 +21,4 @@ target_link_libraries(${TEST_NAME}
1921
gmock_main
2022
)
2123

22-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
23-
24-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
24+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

‎connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME cellular-framework-device-athandler-unittest)
57

68
add_executable(${TEST_NAME})
@@ -39,6 +41,4 @@ target_link_libraries(${TEST_NAME}
3941
gmock_main
4042
)
4143

42-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
43-
44-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
44+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

‎connectivity/cellular/tests/UNITTESTS/framework/device/athandler/athandlertest.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -906,6 +906,7 @@ TEST_F(TestATHandler, test_ATHandler_resp_start)
906906

907907
filehandle_stub_table = NULL;
908908
filehandle_stub_table_pos = 0;
909+
mbed_poll_stub::revents_value = POLLIN;
909910

910911
ATHandler at(&fh1, que, 0, ",");
911912
at.resp_start();
@@ -914,6 +915,7 @@ TEST_F(TestATHandler, test_ATHandler_resp_start)
914915
char table2[] = "\"2,\"OK\r\n\0";
915916
filehandle_stub_table = table2;
916917
filehandle_stub_table_pos = 0;
918+
mbed_poll_stub::int_value = strlen(table2);
917919

918920
at.flush();
919921
at.clear_error();
@@ -1052,12 +1054,14 @@ TEST_F(TestATHandler, test_ATHandler_resp_stop)
10521054
{
10531055
EventQueue que;
10541056
FileHandle_stub fh1;
1057+
mbed_poll_stub::revents_value = POLLIN;
10551058

10561059
ATHandler at(&fh1, que, 0, ",");
10571060

10581061
char table[] = "21 OK\r\n\0";
10591062
filehandle_stub_table = table;
10601063
filehandle_stub_table_pos = 0;
1064+
mbed_poll_stub::int_value = strlen(table);
10611065

10621066
at.info_elem('2');
10631067
at.set_stop_tag("OK\r\n");
@@ -1266,6 +1270,7 @@ TEST_F(TestATHandler, test_ATHandler_at_cmd_str)
12661270
{
12671271
EventQueue que;
12681272
FileHandle_stub fh1;
1273+
mbed_poll_stub::revents_value = POLLIN;
12691274

12701275
ATHandler at(&fh1, que, 0, ",");
12711276
uint8_t byte[] = {1, 2, 3, 4};

‎connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME cellular-framework-device-cellular-context-unittest)
57

68
add_executable(${TEST_NAME})
@@ -45,6 +47,4 @@ target_link_libraries(${TEST_NAME}
4547
gmock_main
4648
)
4749

48-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
49-
50-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
50+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

‎connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME cellular-framework-device-cellular-device-unittest)
57

68
add_executable(${TEST_NAME})
@@ -41,6 +43,4 @@ target_link_libraries(${TEST_NAME}
4143
gmock_main
4244
)
4345

44-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
45-
46-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
46+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

‎connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME cellular-framework-device-cellular-state-machine-unittest)
57

68
add_executable(${TEST_NAME})
@@ -43,6 +45,4 @@ target_link_libraries(${TEST_NAME}
4345
gmock_main
4446
)
4547

46-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
47-
48-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "cellular")
48+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "cellular")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loramac-unittest)
57

68
add_executable(${TEST_NAME})
@@ -45,6 +47,4 @@ target_link_libraries(${TEST_NAME}
4547
gmock_main
4648
)
4749

48-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
49-
50-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
50+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/Test_LoRaMac.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ TEST_F(Test_LoRaMac, post_process_mcps_req)
432432
LoRaMacCrypto_stub::int_table_idx_value = 0;
433433
LoRaMacCrypto_stub::int_table[0] = 4;
434434
LoRaMacCrypto_stub::int_table[1] = 4;
435-
// LoRaPHY_stub::uint16_value = 0;
435+
LoRaPHY_stub::uint16_value = 0;
436436
object->on_radio_rx_done(payload, 16, 0, 0);
437437
object->post_process_mcps_req();
438438

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loramac-channel-plan-unittest)
57

68
add_executable(${TEST_NAME})
@@ -29,6 +31,4 @@ target_link_libraries(${TEST_NAME}
2931
gmock_main
3032
)
3133

32-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
33-
34-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
34+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loramac-command-unittest)
57

68
add_executable(${TEST_NAME})
@@ -30,6 +32,4 @@ target_link_libraries(${TEST_NAME}
3032
gmock_main
3133
)
3234

33-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
34-
35-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
35+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loramac-crypto-unittest)
57

68
add_executable(${TEST_NAME})
@@ -28,6 +30,4 @@ target_link_libraries(${TEST_NAME}
2830
gmock_main
2931
)
3032

31-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
32-
33-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
33+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loraphy-unittest)
57

68
add_executable(${TEST_NAME})
@@ -33,6 +35,4 @@ target_link_libraries(${TEST_NAME}
3335
gmock_main
3436
)
3537

36-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
37-
38-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
38+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loraphy-as923-unittest)
57

68
add_executable(${TEST_NAME})
79

810
target_compile_definitions(${TEST_NAME}
911
PRIVATE
10-
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
12+
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
1113
MBED_CONF_LORA_TX_MAX_SIZE=255
1214
MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
1315
)
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
3133
gmock_main
3234
)
3335

34-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
35-
36-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
36+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loraphy-au915-unittest)
57

68
add_executable(${TEST_NAME})
79

810
target_compile_definitions(${TEST_NAME}
911
PRIVATE
10-
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
12+
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
1113
MBED_CONF_LORA_TX_MAX_SIZE=255
1214
MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
1315
)
@@ -37,6 +39,4 @@ target_link_libraries(${TEST_NAME}
3739
gmock_main
3840
)
3941

40-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
41-
42-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
42+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loraphy-cn470-unittest)
57

68
add_executable(${TEST_NAME})
79

810
target_compile_definitions(${TEST_NAME}
911
PRIVATE
10-
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
12+
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
1113
MBED_CONF_LORA_TX_MAX_SIZE=255
1214
MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
1315
)
@@ -37,6 +39,4 @@ target_link_libraries(${TEST_NAME}
3739
gmock_main
3840
)
3941

40-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
41-
42-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
42+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loraphy-cn779-unittest)
57

68
add_executable(${TEST_NAME})
79

810
target_compile_definitions(${TEST_NAME}
911
PRIVATE
10-
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
12+
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
1113
MBED_CONF_LORA_TX_MAX_SIZE=255
1214
MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
1315
)
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
3133
gmock_main
3234
)
3335

34-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
35-
36-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
36+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loraphy-eu433-unittest)
57

68
add_executable(${TEST_NAME})
79

810
target_compile_definitions(${TEST_NAME}
911
PRIVATE
10-
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
12+
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
1113
MBED_CONF_LORA_TX_MAX_SIZE=255
1214
MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
1315
)
@@ -32,6 +34,4 @@ target_link_libraries(${TEST_NAME}
3234
gmock_main
3335
)
3436

35-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
36-
37-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
37+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

‎connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
include(GoogleTest)
5+
46
set(TEST_NAME lorawan-loraphy-eu868-unittest)
57

68
add_executable(${TEST_NAME})
79

810
target_compile_definitions(${TEST_NAME}
911
PRIVATE
10-
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
12+
MBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5
1113
MBED_CONF_LORA_TX_MAX_SIZE=255
1214
MBED_CONF_LORA_UPLINK_PREAMBLE_LENGTH=8
1315
)
@@ -31,6 +33,4 @@ target_link_libraries(${TEST_NAME}
3133
gmock_main
3234
)
3335

34-
add_test(NAME "${TEST_NAME}" COMMAND ${TEST_NAME})
35-
36-
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "lorawan")
36+
gtest_discover_tests(${TEST_NAME} PROPERTIES LABELS "lorawan")

0 commit comments

Comments
 (0)