From 90c431b280ac0188980b43a42b11191ca2800fa8 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 12 Apr 2009 16:40:44 +0000 Subject: [PATCH] 100% code coverage for condvars. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@898 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- readme.txt | 4 ++-- test/testmtx.c | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/readme.txt b/readme.txt index 87728bdfa..d5a1e3a72 100644 --- a/readme.txt +++ b/readme.txt @@ -84,8 +84,8 @@ Win32-MinGW - ChibiOS/RT simulator and demo into a WIN32 process, - FIX: Removed usused list functions (bug 2755230)(backported in stable branch). - NEW: Added a code coverage analysis application under ./tests/coverage. -- Added more test cases in order to improve code coverage (it was 74% in - version 1.2.0). +- Added more test cases in order to improve the test suite code coverage (it + was 74% in version 1.2.0). *** 1.2.0 *** - Added license exception text to the 1.2.0 branch. diff --git a/test/testmtx.c b/test/testmtx.c index e62bb0c74..421ab9536 100644 --- a/test/testmtx.c +++ b/test/testmtx.c @@ -361,11 +361,14 @@ static void mtx6_execute(void) { threads[2] = chThdCreateStatic(wa[2], WA_SIZE, prio+3, thread10, "C"); threads[3] = chThdCreateStatic(wa[3], WA_SIZE, prio+4, thread10, "B"); threads[4] = chThdCreateStatic(wa[4], WA_SIZE, prio+5, thread10, "A"); - chCondSignal(&c1); - chCondSignal(&c1); - chCondSignal(&c1); - chCondSignal(&c1); - chCondSignal(&c1); + chSysLock(); + chCondSignalI(&c1); + chCondSignalI(&c1); + chCondSignalI(&c1); + chCondSignalI(&c1); + chCondSignalI(&c1); + chSchRescheduleS(); + chSysUnlock(); test_wait_threads(); test_assert_sequence("ABCDE"); } @@ -425,7 +428,7 @@ static msg_t thread11(void *p) { chMtxLock(&m2); chMtxLock(&m1); - chCondWait(&c1); + chCondWaitTimeout(&c1, TIME_INFINITE); test_emit_token(*(char *)p); chMtxUnlock(); chMtxUnlock();