git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@5860 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 7 insertions, 7 deletions

diff --git a/test/testmtx.c b/test/testmtx.c
index f83a9744a..52b5cebd4 100644
--- a/test/testmtx.c
+++ b/test/testmtx.c
@@ -446,13 +446,13 @@ static void mtx5_execute(void) {
   chMtxUnlockS();

   chSysUnlock();

 

-  test_assert(3, isempty(&m1.m_queue), "queue not empty");

+  test_assert(3, queue_isempty(&m1.m_queue), "queue not empty");

   test_assert(4, m1.m_owner == NULL, "still owned");

   test_assert(5, chThdGetPriority() == prio, "wrong priority level");

   

   chMtxLock(&m1);

   chMtxUnlockAll();

-  test_assert(6, isempty(&m1.m_queue), "queue not empty");

+  test_assert(6, queue_isempty(&m1.m_queue), "queue not empty");

   test_assert(7, m1.m_owner == NULL, "still owned");

 }

 

diff --git a/test/testsem.c b/test/testsem.c
index 20774b618..3de2e68fb 100644
--- a/test/testsem.c
+++ b/test/testsem.c
@@ -151,7 +151,7 @@ static void sem2_execute(void) {
    */

   msg = chSemWaitTimeout(&sem1, TIME_IMMEDIATE);

   test_assert(1, msg == RDY_TIMEOUT, "wrong wake-up message");

-  test_assert(2, isempty(&sem1.s_queue), "queue not empty");

+  test_assert(2, queue_isempty(&sem1.s_queue), "queue not empty");

   test_assert(3, sem1.s_cnt == 0, "counter not zero");

 

   /*

@@ -162,7 +162,7 @@ static void sem2_execute(void) {
   msg = chSemWaitTimeout(&sem1, MS2ST(500));

   test_wait_threads();

   test_assert(4, msg == RDY_OK, "wrong wake-up message");

-  test_assert(5, isempty(&sem1.s_queue), "queue not empty");

+  test_assert(5, queue_isempty(&sem1.s_queue), "queue not empty");

   test_assert(6, sem1.s_cnt == 0, "counter not zero");

 

   /*

@@ -174,7 +174,7 @@ static void sem2_execute(void) {
     test_emit_token('A' + i);

     msg = chSemWaitTimeout(&sem1, MS2ST(500));

     test_assert(7, msg == RDY_TIMEOUT, "wrong wake-up message");

-    test_assert(8, isempty(&sem1.s_queue), "queue not empty");

+    test_assert(8, queue_isempty(&sem1.s_queue), "queue not empty");

     test_assert(9, sem1.s_cnt == 0, "counter not zero");

   }

   test_assert_sequence(10, "ABCDE");

@@ -218,11 +218,11 @@ static void sem3_execute(void) {
 

   threads[0] = chThdCreateStatic(wa[0], WA_SIZE, chThdGetPriority()+1, thread3, 0);

   chSemSignalWait(&sem1, &sem1);

-  test_assert(1, isempty(&sem1.s_queue), "queue not empty");

+  test_assert(1, queue_isempty(&sem1.s_queue), "queue not empty");

   test_assert(2, sem1.s_cnt == 0, "counter not zero");

 

   chSemSignalWait(&sem1, &sem1);

-  test_assert(3, isempty(&sem1.s_queue), "queue not empty");

+  test_assert(3, queue_isempty(&sem1.s_queue), "queue not empty");

   test_assert(4, sem1.s_cnt == 0, "counter not zero");

 }