Skip to content

Commit 3795d39

Browse files
author
Cruz Monrreal
authored
Merge pull request #7741 from mprse/disable_ticker_free_tests
tests-mbed_hal-common_tickers: disable ticker free test cases.
2 parents 7b8a137 + 629718b commit 3795d39

File tree

3 files changed

+0
-92
lines changed

3 files changed

+0
-92
lines changed

TESTS/mbed_hal/common_tickers/main.cpp

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -441,14 +441,6 @@ void ticker_speed_test(void)
441441

442442
const ticker_info_t *us_ticker_info = get_us_ticker_data()->interface->get_info();
443443

444-
/* Free function will disable the ticker. For time measurement
445-
* we need to use other one if available.
446-
*/
447-
#if DEVICE_LPTICKER
448-
const ticker_info_t *lp_ticker_info = get_lp_ticker_data()->interface->get_info();
449-
bool us_ticker_test = (intf == get_us_ticker_data()->interface);
450-
#endif
451-
452444
/* ---- Test ticker_read function. ---- */
453445
start = us_ticker_read();
454446
while (counter--) {
@@ -498,71 +490,8 @@ void ticker_speed_test(void)
498490

499491
TEST_ASSERT(diff_us(start, stop, us_ticker_info) < (NUM_OF_CALLS * (MAX_FUNC_EXEC_TIME_US + DELTA_FUNC_EXEC_TIME_US)));
500492

501-
/* ---- Test free function. ---- */
502-
#if DEVICE_LPTICKER
503-
counter = NUM_OF_CALLS;
504-
if (us_ticker_test) {
505-
lp_ticker_init();
506-
}
507-
start = us_ticker_test ? lp_ticker_read() : us_ticker_read();
508-
while (counter--) {
509-
intf->free();
510-
}
511-
stop = us_ticker_test ? lp_ticker_read() : us_ticker_read();
512-
513-
TEST_ASSERT(diff_us(start, stop, us_ticker_info) < (NUM_OF_CALLS * (MAX_FUNC_EXEC_TIME_US + DELTA_FUNC_EXEC_TIME_US)));
514-
#endif
515-
}
516-
517-
/* Test that ticker_free disables ticker interrupt. */
518-
void ticker_free_interrupt_test(void)
519-
{
520-
overflow_protect();
521-
522-
uint32_t cycles_500_ticks = 50;
523-
uint32_t reference_ticks_count = 0;
524-
525-
while (reference_ticks_count < TICKER_500_TICKS) {
526-
cycles_500_ticks *= 2;
527-
const uint32_t start = intf->read();
528-
wait_cycles(cycles_500_ticks);
529-
reference_ticks_count = intf->read() - start;
530-
}
531-
532-
intFlag = 0;
533-
534-
intf->set_interrupt(intf->read() + (TICKER_500_TICKS / 2));
535-
intf->free();
536-
wait_cycles(cycles_500_ticks);
537-
intf->init();
538-
TEST_ASSERT_EQUAL(0, intFlag);
539-
}
540-
541-
/* Test that ticker can be successfully re-initialized after free(). */
542-
void ticker_init_free_test(void)
543-
{
544-
intf->free();
545-
intf->init();
546-
547-
overflow_protect();
548-
549-
intFlag = 0;
550-
551-
const uint32_t tick_count = intf->read();
552-
553-
intf->set_interrupt(intf->read() + TICKER_INT_VAL);
554-
555-
while (intf->read() < (tick_count + TICKER_INT_VAL - TICKER_DELTA)) {
556-
TEST_ASSERT_EQUAL_INT_MESSAGE(0, intFlag, "Interrupt fired too early");
557-
}
558-
559-
while (intf->read() < (tick_count + TICKER_INT_VAL + TICKER_DELTA)) {
560-
}
561-
562-
TEST_ASSERT_EQUAL(1, intFlag);
563493
}
564494

565-
566495
utest::v1::status_t us_ticker_setup(const Case *const source, const size_t index_of_case)
567496
{
568497
intf = get_us_ticker_data()->interface;
@@ -637,8 +566,6 @@ Case cases[] = {
637566
Case("Microsecond ticker overflow test", us_ticker_setup, ticker_overflow_test, us_ticker_teardown),
638567
Case("Microsecond ticker increment test", us_ticker_setup, ticker_increment_test, us_ticker_teardown),
639568
Case("Microsecond ticker speed test", us_ticker_setup, ticker_speed_test, us_ticker_teardown),
640-
Case("Microsecond ticker free interrupt test", us_ticker_setup, ticker_free_interrupt_test, us_ticker_teardown),
641-
Case("Microsecond re-init after free test", us_ticker_setup, ticker_init_free_test, us_ticker_teardown),
642569
#if DEVICE_LPTICKER
643570
Case("lp ticker init is safe to call repeatedly", lp_ticker_setup, ticker_init_test, lp_ticker_teardown),
644571
Case("lp ticker info test", lp_ticker_setup, ticker_info_test, lp_ticker_teardown),
@@ -649,8 +576,6 @@ Case cases[] = {
649576
Case("lp ticker overflow test", lp_ticker_setup, ticker_overflow_test, lp_ticker_teardown),
650577
Case("lp ticker increment test", lp_ticker_setup, ticker_increment_test, lp_ticker_teardown),
651578
Case("lp ticker speed test", lp_ticker_setup, ticker_speed_test, lp_ticker_teardown),
652-
Case("lp ticker free interrupt test", lp_ticker_setup, ticker_free_interrupt_test, lp_ticker_teardown),
653-
Case("lp ticker re-init after free test", lp_ticker_setup, ticker_init_free_test, lp_ticker_teardown),
654579
#endif
655580
};
656581

TESTS/mbed_hal/common_tickers/ticker_api_tests.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,6 @@ void ticker_speed_test(void);
118118
*/
119119
void ticker_overflow_test(void);
120120

121-
/** Test ticker_free disables ticker interrupt.
122-
*
123-
* Given ticker is available.
124-
* When ticker interrupt is set and then ticker_free is called.
125-
* Then ticker interrupt is not triggered.
126-
*/
127-
void ticker_free_interrupt_test(void);
128-
129-
/** Test that ticker can be successfully re-initialized after free().
130-
*
131-
* Given ticker is available.
132-
* When ticker has been re-initialized after free().
133-
* Then ticker counts and generates interrupts.
134-
*/
135-
void ticker_init_free_test(void);
136121
/**@}*/
137122

138123
#ifdef __cplusplus

hal/us_ticker_api.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ extern "C" {
7373
* Verified by ::ticker_fire_now_test
7474
* * The ticker operations ticker_read, ticker_clear_interrupt, ticker_set_interrupt and ticker_fire_interrupt
7575
* take less than 20us to complete - Verified by ::ticker_speed_test
76-
* * The function ticker_free disables the ticker interrupt - ::ticker_free_interrupt_test
77-
* * The function ticker_init re-initializes ticker after has been disabled by means of ticker_free - Verified by ::ticker_init_free_test
7876
*
7977
* # Undefined behavior
8078
* * Calling any function other than ticker_init before the initialization of the ticker

0 commit comments

Comments
 (0)