Skip to content

Commit f1139eb

Browse files
rajkan01rajkan01
committed
Incorporated the review comments
-Added "rtos-api" in TESTS/configs/baremetal.json -some test case used thread_sleep_for instead Thisthread::sleep_for -Added the EOF character -Disable completely the non supported test cases
1 parent b1731ce commit f1139eb

File tree

24 files changed

+49
-100
lines changed

24 files changed

+49
-100
lines changed

‎TESTS/configs/baremetal.json

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"requires": [
33
"bare-metal",
4+
"rtos-api",
45
"greentea-client",
56
"utest",
67
"unity",
@@ -12,29 +13,29 @@
1213
"littlefs",
1314
"mbed-trace",
1415
"device_key",
15-
"storage_tdb_internal",
16-
"storage_filesystem",
17-
"storage_tdb_external",
16+
"storage_tdb_internal",
17+
"storage_filesystem",
18+
"storage_tdb_external",
1819
"lora",
19-
"nfc",
20-
"network-emac",
21-
"nanostack-libservice",
22-
"flashiap-block-device",
23-
"system-storage",
24-
"filesystemstore",
25-
"SecureStore",
26-
"storage",
27-
"kv-map",
28-
"direct-access-devicekey",
29-
"tdbstore",
30-
"kv-config",
31-
"events",
32-
"kv-global-api",
33-
"sd"
20+
"nfc",
21+
"network-emac",
22+
"nanostack-libservice",
23+
"flashiap-block-device",
24+
"system-storage",
25+
"filesystemstore",
26+
"SecureStore",
27+
"storage",
28+
"kv-map",
29+
"direct-access-devicekey",
30+
"tdbstore",
31+
"kv-config",
32+
"events",
33+
"kv-global-api",
34+
"sd"
3435
],
3536
"target_overrides": {
3637
"*": {
37-
"target.device_has_remove": ["EMAC", "USBDEVICE"]
38+
"target.device_has_remove": ["EMAC", "USBDEVICE"]
3839
}
3940
}
4041
}

‎TESTS/events/timing/main.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ void timer_timing_test()
8686
// equeue tick timing test
8787
void tick_timing_test()
8888
{
89-
#if defined(MBED_CONF_RTOS_PRESENT)
9089
unsigned start = equeue_tick();
9190
int prev = 0;
9291

@@ -99,13 +98,11 @@ void tick_timing_test()
9998
TEST_ASSERT(next >= prev);
10099
prev = next;
101100
}
102-
#endif
103101
}
104102

105103
// equeue semaphore timing test
106104
void semaphore_timing_test()
107105
{
108-
#if defined(MBED_CONF_RTOS_PRESENT)
109106
srand(0);
110107
timer.reset();
111108
timer.start();
@@ -130,7 +127,6 @@ void semaphore_timing_test()
130127
}
131128

132129
equeue_sema_destroy(&sema);
133-
#endif
134130
}
135131

136132

‎TESTS/integration/COMMON/file_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ void file_test_read(const char *file, size_t offset, const unsigned char *data,
104104
float(data_length) / 1024, float(data_length) / timer.read() / 1024, timer.read());
105105
}
106106

107-
#endif //#if INTEGRATION_TESTS
107+
#endif //#if INTEGRATION_TESTS

‎TESTS/integration/COMMON/file_test.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
void file_test_write(const char *file, size_t offset, const unsigned char *data, size_t data_length, size_t block_size);
2525

2626
void file_test_read(const char *file, size_t offset, const unsigned char *data, size_t data_length, size_t block_size);
27-
#endif
27+
#endif

‎TESTS/mbed_drivers/crc/main.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ void test_thread(void)
134134
TEST_ASSERT_EQUAL(0xCBF43926, crc);
135135
}
136136

137+
#if defined(MBED_CONF_RTOS_PRESENT)
137138
void test_thread_safety()
138139
{
139-
#if defined(MBED_CONF_RTOS_PRESENT)
140140
char test[] = "123456789";
141141
uint32_t crc;
142142

@@ -153,15 +153,17 @@ void test_thread_safety()
153153

154154
// Wait for the thread to finish
155155
t1.join();
156-
#endif
157156
}
157+
#endif
158158

159159
Case cases[] = {
160160
Case("Test supported polynomials", test_supported_polynomials),
161161
Case("Test partial CRC", test_partial_crc),
162162
Case("Test SD CRC polynomials", test_sd_crc),
163-
Case("Test not supported polynomials", test_any_polynomial),
164-
Case("Test thread safety", test_thread_safety)
163+
#if defined(MBED_CONF_RTOS_PRESENT)
164+
Case("Test thread safety", test_thread_safety),
165+
#endif
166+
Case("Test not supported polynomials", test_any_polynomial)
165167
};
166168

167169
utest::v1::status_t greentea_test_setup(const size_t number_of_cases)

‎TESTS/mbed_drivers/lp_ticker/main.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ volatile uint32_t multi_counter;
4343
Timer gtimer;
4444

4545

46-
#if defined(MBED_CONF_RTOS_PRESENT)
46+
4747
void sem_release(Semaphore *sem)
4848
{
4949
sem->release();
5050
}
51-
#endif
51+
5252

5353
void stop_gtimer_set_flag(void)
5454
{
@@ -71,7 +71,6 @@ void increment_multi_counter(void)
7171
*/
7272
void test_multi_ticker(void)
7373
{
74-
#if defined(MBED_CONF_RTOS_PRESENT)
7574
LowPowerTicker ticker[TICKER_COUNT];
7675
const uint32_t extra_wait = 10; // extra 10ms wait time
7776

@@ -106,7 +105,6 @@ void test_multi_ticker(void)
106105
// (e.g. when head event is removed), it's good to check if
107106
// no more callbacks were triggered during detaching.
108107
TEST_ASSERT_EQUAL(TICKER_COUNT, multi_counter);
109-
#endif
110108
}
111109

112110
/** Test multi callback time
@@ -142,7 +140,6 @@ void test_multi_call_time(void)
142140
*/
143141
void test_detach(void)
144142
{
145-
#if defined(MBED_CONF_RTOS_PRESENT)
146143
LowPowerTicker ticker;
147144
bool ret;
148145
const float ticker_time_s = 0.1f;
@@ -158,7 +155,6 @@ void test_detach(void)
158155

159156
ret = sem.try_acquire_for(wait_time_ms);
160157
TEST_ASSERT_FALSE(ret);
161-
#endif
162158
}
163159

164160
/** Test single callback time via attach

‎TESTS/mbed_drivers/lp_timer/main.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
#include "greentea-client/test_env.h"
2020
#include "unity.h"
2121
#include "utest.h"
22-
#if defined(MBED_CONF_RTOS_PRESENT)
23-
#include "rtos.h"
24-
#endif
2522
#include "hal/us_ticker_api.h"
2623

2724
#if !DEVICE_LPTICKER

‎TESTS/mbed_drivers/rtc/main.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
#include "greentea-client/test_env.h"
1919
#include "unity.h"
2020
#include "utest.h"
21-
#if defined(MBED_CONF_RTOS_PRESENT)
22-
#include "rtos.h"
23-
#endif
2421
#include "rtc_api.h"
2522

2623
#if !DEVICE_RTC || !DEVICE_USTICKER

‎TESTS/mbed_drivers/ticker/main.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,11 @@ void ticker_callback_2(void)
7676
}
7777
}
7878

79-
#if defined(MBED_CONF_RTOS_PRESENT)
79+
8080
void sem_release(Semaphore *sem)
8181
{
8282
sem->release();
8383
}
84-
#endif
8584

8685

8786
void stop_gtimer_set_flag(void)
@@ -194,7 +193,6 @@ void test_case_2x_ticker()
194193
*/
195194
void test_multi_ticker(void)
196195
{
197-
#if defined(MBED_CONF_RTOS_PRESENT)
198196
Ticker ticker[TICKER_COUNT];
199197
const uint32_t extra_wait = 5; // extra 5ms wait time
200198

@@ -229,7 +227,6 @@ void test_multi_ticker(void)
229227
// (e.g. when head event is removed), it's good to check if
230228
// no more callbacks were triggered during detaching.
231229
TEST_ASSERT_EQUAL(TICKER_COUNT, multi_counter);
232-
#endif
233230
}
234231

235232
/** Test multi callback time
@@ -265,7 +262,6 @@ void test_multi_call_time(void)
265262
*/
266263
void test_detach(void)
267264
{
268-
#if defined(MBED_CONF_RTOS_PRESENT)
269265
Ticker ticker;
270266
bool ret;
271267
const float ticker_time_s = 0.1f;
@@ -281,7 +277,6 @@ void test_detach(void)
281277

282278
ret = sem.try_acquire_for(wait_time_ms);
283279
TEST_ASSERT_FALSE(ret);
284-
#endif
285280
}
286281

287282
/** Test single callback time via attach

‎TESTS/mbed_drivers/timeout/main.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
17-
#if !defined(MBED_CONF_RTOS_PRESENT)
18-
#error [NOT_SUPPORTED] usticker test requires RTOS to run.
19-
#else
20-
2116
#include "mbed.h"
2217
#include "greentea-client/test_env.h"
2318
#include "utest/utest.h"
@@ -94,4 +89,3 @@ int main()
9489
}
9590

9691
#endif // !DEVICE_USTICKER
97-
#endif // !defined(MBED_CONF_RTOS_PRESENT)

‎TESTS/mbed_drivers/timeout/timeout_tests.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
#ifndef MBED_TIMEOUT_TESTS_H
1717
#define MBED_TIMEOUT_TESTS_H
18-
#if defined(MBED_CONF_RTOS_PRESENT)
1918

2019
#include "mbed.h"
2120
#include "unity/unity.h"
@@ -414,5 +413,4 @@ void test_drift(void)
414413
TEST_ASSERT_EQUAL_STRING_MESSAGE("pass", _key, "Host script reported a failure");
415414
}
416415

417-
#endif // defined(MBED_CONF_RTOS_PRESENT)
418416
#endif

‎TESTS/mbed_drivers/timer/main.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
#include "greentea-client/test_env.h"
2020
#include "unity.h"
2121
#include "utest.h"
22-
#if defined(MBED_CONF_RTOS_PRESENT)
23-
#include "rtos.h"
24-
#endif
2522
#include "hal/us_ticker_api.h"
2623

2724
#if !DEVICE_USTICKER

‎TESTS/mbed_drivers/timerevent/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#if !DEVICE_USTICKER || !defined(MBED_CONF_RTOS_PRESENT)
17-
#error [NOT_SUPPORTED] usticker test case requires RTOS to run and also usticker needs to be enabled for this target.
16+
#if !DEVICE_USTICKER
17+
#error [NOT_SUPPORTED] usticker not supported for this target.
1818
#else
1919

2020
#include "mbed.h"
@@ -243,4 +243,4 @@ int main()
243243
return !Harness::run(specification);
244244
}
245245

246-
#endif // !DEVICE_USTICKER || !defined(MBED_CONF_RTOS_PRESENT)
246+
#endif // !DEVICE_USTICKER

‎TESTS/mbed_hal/rtc/main.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ void rtc_sleep_test()
120120
/* Test that the RTC keeps counting even after ::rtc_free has been called. */
121121
void rtc_persist_test()
122122
{
123-
#if defined(MBED_CONF_RTOS_PRESENT)
124123
const uint32_t start = 100;
125124
rtc_init();
126125
rtc_write(start);
@@ -135,7 +134,6 @@ void rtc_persist_test()
135134

136135
TEST_ASSERT_TRUE(enabled);
137136
TEST_ASSERT_UINT32_WITHIN(WAIT_TOLERANCE, WAIT_TIME, stop - start);
138-
#endif
139137
}
140138

141139
/* Test time does not glitch backwards due to an incorrectly implemented ripple counter driver. */
@@ -158,7 +156,6 @@ void rtc_glitch_test()
158156
/* Test that the RTC correctly handles different time values. */
159157
void rtc_range_test()
160158
{
161-
#if defined(MBED_CONF_RTOS_PRESENT)
162159
static const uint32_t starts[] = {
163160
0x00000000,
164161
0xEFFFFFFF,
@@ -175,7 +172,6 @@ void rtc_range_test()
175172
TEST_ASSERT_UINT32_WITHIN(WAIT_TOLERANCE, WAIT_TIME, stop - start);
176173
}
177174
rtc_free();
178-
#endif
179175
}
180176

181177
/* Test that the RTC accuracy is at least 10%. */

‎TESTS/mbed_hal/sleep_manager_racecondition/main.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ void sleep_manager_locking_thread_test()
3535
sleep_manager_unlock_deep_sleep();
3636
}
3737
}
38-
#endif
38+
3939
void sleep_manager_multithread_test()
4040
{
41-
#if defined(MBED_CONF_RTOS_PRESENT)
4241
{
4342
Callback<void()> cb(sleep_manager_locking_thread_test);
4443
Thread t1(osPriorityNormal, TEST_STACK_SIZE);
@@ -55,8 +54,8 @@ void sleep_manager_multithread_test()
5554

5655
bool deep_sleep_allowed = sleep_manager_can_deep_sleep_test_check();
5756
TEST_ASSERT_TRUE_MESSAGE(deep_sleep_allowed, "Deep sleep should be allowed");
58-
#endif
5957
}
58+
#endif
6059

6160
void sleep_manager_locking_irq_test()
6261
{
@@ -93,7 +92,9 @@ utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
9392
}
9493

9594
Case cases[] = {
95+
#if defined(MBED_CONF_RTOS_PRESENT)
9696
Case("deep sleep lock/unlock is thread safe", sleep_manager_multithread_test),
97+
#endif
9798
Case("deep sleep lock/unlock is IRQ safe", sleep_manager_irq_test),
9899
};
99100

0 commit comments

Comments
 (0)