From 88bea4b8c200fad936c063718289250ce49cda61 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Fri, 25 Jun 2010 08:55:40 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2038 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- test/test.c | 6 +++--- test/test.h | 12 ++++++------ test/testbmk.c | 28 ++++++++++++++-------------- test/testbmk.h | 2 +- test/testdyn.c | 8 ++++---- test/testdyn.h | 2 +- test/testevt.c | 10 +++++----- test/testevt.h | 2 +- test/testheap.c | 4 ++-- test/testheap.h | 2 +- test/testmbox.c | 4 ++-- test/testmbox.h | 2 +- test/testmsg.c | 4 ++-- test/testmsg.h | 2 +- test/testmtx.c | 18 +++++++++--------- test/testmtx.h | 2 +- test/testpools.c | 4 ++-- test/testpools.h | 2 +- test/testqueues.c | 6 +++--- test/testqueues.h | 2 +- test/testsem.c | 8 ++++---- test/testsem.h | 2 +- test/testthd.c | 10 +++++----- test/testthd.h | 2 +- 24 files changed, 72 insertions(+), 72 deletions(-) (limited to 'test') diff --git a/test/test.c b/test/test.c index 3a5c93edc..5f876e6b8 100644 --- a/test/test.c +++ b/test/test.c @@ -44,7 +44,7 @@ /* * Array of all the test patterns. */ -static const struct testcase **patterns[] = { +static ROMCONST struct testcase **patterns[] = { patternthd, patternsem, patternmtx, @@ -78,8 +78,8 @@ Thread *threads[MAX_THREADS]; /* * Pointers to the working areas. */ -void * const wa[5] = {test.wa.T0, test.wa.T1, test.wa.T2, - test.wa.T3, test.wa.T4}; +void * ROMCONST wa[5] = {test.wa.T0, test.wa.T1, test.wa.T2, + test.wa.T3, test.wa.T4}; /* * Console output. diff --git a/test/test.h b/test/test.h index 2ab27847e..0815cfcfa 100644 --- a/test/test.h +++ b/test/test.h @@ -45,10 +45,10 @@ #define MAX_THREADS 5 #define MAX_TOKENS 16 -#if defined(CH_ARCHITECTURE_AVR) || \ - defined(CH_ARCHITECTURE_MSP430) || \ - defined(CH_ARCHITECTURE_STM8) +#if defined(CH_ARCHITECTURE_AVR) || defined(CH_ARCHITECTURE_MSP430) #define THREADS_STACK_SIZE 48 +#elif defined(CH_ARCHITECTURE_STM8) +#define THREADS_STACK_SIZE 64 #elif defined(CH_ARCHITECTURE_SIMIA32) #define THREADS_STACK_SIZE 512 #else @@ -84,8 +84,8 @@ extern "C" { #endif msg_t TestThread(void *p); void test_printn(uint32_t n); - void test_print(const char *msgp); - void test_println(const char *msgp); + void test_print(char *msgp); + void test_println(char *msgp); void test_emit_token(char token); bool_t _test_fail(unsigned point); bool_t _test_assert(unsigned point, bool_t condition); @@ -151,7 +151,7 @@ extern "C" { #if !defined(__DOXYGEN__) extern Thread *threads[MAX_THREADS]; extern union test_buffers test; -extern void * const wa[]; +extern void * ROMCONST wa[]; extern bool_t test_timer_done; #endif diff --git a/test/testbmk.c b/test/testbmk.c index a67c09af1..0f38eb78b 100644 --- a/test/testbmk.c +++ b/test/testbmk.c @@ -115,7 +115,7 @@ static void bmk1_execute(void) { test_println(" ctxswc/S"); } -const struct testcase testbmk1 = { +ROMCONST struct testcase testbmk1 = { "Benchmark, messages #1", NULL, NULL, @@ -144,7 +144,7 @@ static void bmk2_execute(void) { test_println(" ctxswc/S"); } -const struct testcase testbmk2 = { +ROMCONST struct testcase testbmk2 = { "Benchmark, messages #2", NULL, NULL, @@ -183,7 +183,7 @@ static void bmk3_execute(void) { test_println(" ctxswc/S"); } -const struct testcase testbmk3 = { +ROMCONST struct testcase testbmk3 = { "Benchmark, messages #3", NULL, NULL, @@ -244,7 +244,7 @@ static void bmk4_execute(void) { test_println(" ctxswc/S"); } -const struct testcase testbmk4 = { +ROMCONST struct testcase testbmk4 = { "Benchmark, context switch", NULL, NULL, @@ -281,7 +281,7 @@ static void bmk5_execute(void) { test_println(" threads/S"); } -const struct testcase testbmk5 = { +ROMCONST struct testcase testbmk5 = { "Benchmark, threads, full cycle", NULL, NULL, @@ -320,7 +320,7 @@ static void bmk6_execute(void) { test_println(" threads/S"); } -const struct testcase testbmk6 = { +ROMCONST struct testcase testbmk6 = { "Benchmark, threads, create only", NULL, NULL, @@ -381,7 +381,7 @@ static void bmk7_execute(void) { test_println(" ctxswc/S"); } -const struct testcase testbmk7 = { +ROMCONST struct testcase testbmk7 = { "Benchmark, mass reschedule, 5 threads", bmk7_setup, NULL, @@ -434,7 +434,7 @@ static void bmk8_execute(void) { test_println(" ctxswc/S"); } -const struct testcase testbmk8 = { +ROMCONST struct testcase testbmk8 = { "Benchmark, round robin context switching", NULL, NULL, @@ -479,7 +479,7 @@ static void bmk9_execute(void) { test_println(" bytes/S"); } -const struct testcase testbmk9 = { +ROMCONST struct testcase testbmk9 = { "Benchmark, I/O Queues throughput", NULL, NULL, @@ -520,7 +520,7 @@ static void bmk10_execute(void) { test_println(" timers/S"); } -const struct testcase testbmk10 = { +ROMCONST struct testcase testbmk10 = { "Benchmark, virtual timers set/reset", NULL, NULL, @@ -566,7 +566,7 @@ static void bmk11_execute(void) { test_println(" wait+signal/S"); } -const struct testcase testbmk11 = { +ROMCONST struct testcase testbmk11 = { "Benchmark, semaphores wait/signal", bmk11_setup, NULL, @@ -613,7 +613,7 @@ static void bmk12_execute(void) { test_println(" lock+unlock/S"); } -const struct testcase testbmk12 = { +ROMCONST struct testcase testbmk12 = { "Benchmark, mutexes lock/unlock", bmk12_setup, NULL, @@ -674,7 +674,7 @@ static void bmk13_execute(void) { #endif } -const struct testcase testbmk13 = { +ROMCONST struct testcase testbmk13 = { "Benchmark, RAM footprint", NULL, NULL, @@ -684,7 +684,7 @@ const struct testcase testbmk13 = { /** * @brief Test sequence for benchmarks. */ -const struct testcase * const patternbmk[] = { +ROMCONST struct testcase * ROMCONST patternbmk[] = { #if !TEST_NO_BENCHMARKS &testbmk1, &testbmk2, diff --git a/test/testbmk.h b/test/testbmk.h index 775ea4501..5dde9a60c 100644 --- a/test/testbmk.h +++ b/test/testbmk.h @@ -20,6 +20,6 @@ #ifndef _TESTBMK_H_ #define _TESTBMK_H_ -extern const struct testcase *patternbmk[]; +extern ROMCONST struct testcase * ROMCONST patternbmk[]; #endif /* _TESTBMK_H_ */ diff --git a/test/testdyn.c b/test/testdyn.c index 4bd4ed06c..69a1c3312 100644 --- a/test/testdyn.c +++ b/test/testdyn.c @@ -117,7 +117,7 @@ static void dyn1_execute(void) { test_assert(4, n == sz, "heap size changed"); } -const struct testcase testdyn1 = { +ROMCONST struct testcase testdyn1 = { "Dynamic APIs, threads creation from heap", dyn1_setup, NULL, @@ -173,7 +173,7 @@ static void dyn2_execute(void) { test_assert(4, chPoolAlloc(&mp1) == NULL, "pool list not empty"); } -const struct testcase testdyn2 = { +ROMCONST struct testcase testdyn2 = { "Dynamic APIs, threads creation from memory pool", dyn2_setup, NULL, @@ -240,7 +240,7 @@ static void dyn3_execute(void) { test_assert(7, n1 == n3, "unexpected threads count"); } -const struct testcase testdyn3 = { +ROMCONST struct testcase testdyn3 = { "Dynamic APIs, registry and references", dyn3_setup, NULL, @@ -252,7 +252,7 @@ const struct testcase testdyn3 = { /** * @brief Test sequence for dynamic APIs. */ -const struct testcase * const patterndyn[] = { +ROMCONST struct testcase * ROMCONST patterndyn[] = { #if CH_USE_DYNAMIC #if CH_USE_HEAP &testdyn1, diff --git a/test/testdyn.h b/test/testdyn.h index 676f0863c..efcd4dc1e 100644 --- a/test/testdyn.h +++ b/test/testdyn.h @@ -20,6 +20,6 @@ #ifndef _TESTDYN_H_ #define _TESTDYN_H_ -extern const struct testcase *patterndyn[]; +extern ROMCONST struct testcase * ROMCONST patterndyn[]; #endif /* _TESTDYN_H_ */ diff --git a/test/testevt.c b/test/testevt.c index 7e3f4a405..677e06d44 100644 --- a/test/testevt.c +++ b/test/testevt.c @@ -83,7 +83,7 @@ static void evt1_setup(void) { static void h1(eventid_t id) {(void)id;test_emit_token('A');} static void h2(eventid_t id) {(void)id;test_emit_token('B');} static void h3(eventid_t id) {(void)id;test_emit_token('C');} -static const evhandler_t evhndl[] = {h1, h2, h3}; +static ROMCONST evhandler_t evhndl[] = {h1, h2, h3}; static void evt1_execute(void) { EventListener el1, el2; @@ -107,7 +107,7 @@ static void evt1_execute(void) { test_assert_sequence(4, "ABC"); } -const struct testcase testevt1 = { +ROMCONST struct testcase testevt1 = { "Events, registration and dispatch", evt1_setup, NULL, @@ -224,7 +224,7 @@ static void evt2_execute(void) { test_assert(15, !chEvtIsListening(&es2), "stuck listener"); } -const struct testcase testevt2 = { +ROMCONST struct testcase testevt2 = { "Events, wait and broadcast", evt2_setup, NULL, @@ -272,7 +272,7 @@ static void evt3_execute(void) { test_assert(6, m == 0, "spurious event"); } -const struct testcase testevt3 = { +ROMCONST struct testcase testevt3 = { "Events, timeouts", evt3_setup, NULL, @@ -283,7 +283,7 @@ const struct testcase testevt3 = { /** * @brief Test sequence for events. */ -const struct testcase * const patternevt[] = { +ROMCONST struct testcase * ROMCONST patternevt[] = { #if CH_USE_EVENTS &testevt1, &testevt2, diff --git a/test/testevt.h b/test/testevt.h index 9fb501265..687b16912 100644 --- a/test/testevt.h +++ b/test/testevt.h @@ -20,6 +20,6 @@ #ifndef _TESTEVT_H_ #define _TESTEVT_H_ -extern const struct testcase *patternevt[]; +extern ROMCONST struct testcase * ROMCONST patternevt[]; #endif /* _TESTEVT_H_ */ diff --git a/test/testheap.c b/test/testheap.c index 698a01861..94fb87bb9 100644 --- a/test/testheap.c +++ b/test/testheap.c @@ -142,7 +142,7 @@ static void heap1_execute(void) { test_assert(12, n == sz, "size changed"); } -const struct testcase testheap1 = { +ROMCONST struct testcase testheap1 = { "Heap, allocation and fragmentation test", heap1_setup, NULL, @@ -154,7 +154,7 @@ const struct testcase testheap1 = { /** * @brief Test sequence for heap. */ -const struct testcase * const patternheap[] = { +ROMCONST struct testcase * ROMCONST patternheap[] = { #if CH_USE_HEAP &testheap1, #endif diff --git a/test/testheap.h b/test/testheap.h index c847036bf..d5ce66ce3 100644 --- a/test/testheap.h +++ b/test/testheap.h @@ -20,6 +20,6 @@ #ifndef _TESTHEAP_H_ #define _TESTHEAP_H_ -extern const struct testcase *patternheap[]; +extern ROMCONST struct testcase * ROMCONST patternheap[]; #endif /* _TESTHEAP_H_ */ diff --git a/test/testmbox.c b/test/testmbox.c index 7926f3d06..33706b5f5 100644 --- a/test/testmbox.c +++ b/test/testmbox.c @@ -155,7 +155,7 @@ static void mbox1_execute(void) { test_assert(21, mb1.mb_buffer == mb1.mb_rdptr, "read pointer not aligned to base"); } -const struct testcase testmbox1 = { +ROMCONST struct testcase testmbox1 = { "Mailboxes, queuing and timeouts", mbox1_setup, NULL, @@ -167,7 +167,7 @@ const struct testcase testmbox1 = { /** * @brief Test sequence for mailboxes. */ -const struct testcase * const patternmbox[] = { +ROMCONST struct testcase * ROMCONST patternmbox[] = { #if CH_USE_MAILBOXES &testmbox1, #endif diff --git a/test/testmbox.h b/test/testmbox.h index 5cd4ea8c7..fc75552a3 100644 --- a/test/testmbox.h +++ b/test/testmbox.h @@ -20,6 +20,6 @@ #ifndef _TESTMBOX_H_ #define _TESTMBOX_H_ -extern const struct testcase *patternmbox[]; +extern ROMCONST struct testcase * ROMCONST patternmbox[]; #endif /* _TESTMBOX_H_ */ diff --git a/test/testmsg.c b/test/testmsg.c index 5db9614bb..881db167f 100644 --- a/test/testmsg.c +++ b/test/testmsg.c @@ -101,7 +101,7 @@ static void msg1_execute(void) { test_assert(3, msg == 0, "unknown message"); } -const struct testcase testmsg1 = { +ROMCONST struct testcase testmsg1 = { "Messages, loop", NULL, NULL, @@ -113,7 +113,7 @@ const struct testcase testmsg1 = { /** * @brief Test sequence for messages. */ -const struct testcase * const patternmsg[] = { +ROMCONST struct testcase * ROMCONST patternmsg[] = { #if CH_USE_MESSAGES &testmsg1, #endif diff --git a/test/testmsg.h b/test/testmsg.h index 0b96557e0..d7817d427 100644 --- a/test/testmsg.h +++ b/test/testmsg.h @@ -20,6 +20,6 @@ #ifndef _TESTMSG_H_ #define _TESTMSG_H_ -extern const struct testcase *patternmsg[]; +extern ROMCONST struct testcase * ROMCONST patternmsg[]; #endif /* _TESTMSG_H_ */ diff --git a/test/testmtx.c b/test/testmtx.c index 7337b1f14..339403127 100644 --- a/test/testmtx.c +++ b/test/testmtx.c @@ -112,7 +112,7 @@ static void mtx1_execute(void) { test_assert_sequence(2, "ABCDE"); } -const struct testcase testmtx1 = { +ROMCONST struct testcase testmtx1 = { "Mutexes, priority enqueuing test", mtx1_setup, NULL, @@ -203,7 +203,7 @@ static void mtx2_execute(void) { test_assert_time_window(2, time + MS2ST(100), time + MS2ST(100) + ALLOWED_DELAY); } -const struct testcase testmtx2 = { +ROMCONST struct testcase testmtx2 = { "Mutexes, priority inheritance, simple case", mtx2_setup, NULL, @@ -323,7 +323,7 @@ static void mtx3_execute(void) { test_assert_time_window(2, time + MS2ST(110), time + MS2ST(110) + ALLOWED_DELAY); } -const struct testcase testmtx3 = { +ROMCONST struct testcase testmtx3 = { "Mutexes, priority inheritance, complex case", mtx3_setup, NULL, @@ -411,7 +411,7 @@ static void mtx4_execute(void) { test_wait_threads(); } -const struct testcase testmtx4 = { +ROMCONST struct testcase testmtx4 = { "Mutexes, priority return", mtx4_setup, NULL, @@ -454,7 +454,7 @@ static void mtx5_execute(void) { test_assert(5, chThdGetPriority() == prio, "wrong priority level"); } -const struct testcase testmtx5 = { +ROMCONST struct testcase testmtx5 = { "Mutexes, status", mtx5_setup, NULL, @@ -508,7 +508,7 @@ static void mtx6_execute(void) { test_assert_sequence(1, "ABCDE"); } -const struct testcase testmtx6 = { +ROMCONST struct testcase testmtx6 = { "CondVar, signal test", mtx6_setup, NULL, @@ -545,7 +545,7 @@ static void mtx7_execute(void) { test_assert_sequence(1, "ABCDE"); } -const struct testcase testmtx7 = { +ROMCONST struct testcase testmtx7 = { "CondVar, broadcast test", mtx7_setup, NULL, @@ -603,7 +603,7 @@ static void mtx8_execute(void) { test_assert_sequence(1, "ABC"); } -const struct testcase testmtx8 = { +ROMCONST struct testcase testmtx8 = { "CondVar, boost test", mtx8_setup, NULL, @@ -615,7 +615,7 @@ const struct testcase testmtx8 = { /** * @brief Test sequence for mutexes. */ -const struct testcase * const patternmtx[] = { +ROMCONST struct testcase * ROMCONST patternmtx[] = { #if CH_USE_MUTEXES &testmtx1, #if CH_DBG_THREADS_PROFILING diff --git a/test/testmtx.h b/test/testmtx.h index b28837775..cd7ddf497 100644 --- a/test/testmtx.h +++ b/test/testmtx.h @@ -20,6 +20,6 @@ #ifndef _TESTMTX_H_ #define _TESTMTX_H_ -extern const struct testcase *patternmtx[]; +extern ROMCONST struct testcase * ROMCONST patternmtx[]; #endif /* _TESTMTX_H_ */ diff --git a/test/testpools.c b/test/testpools.c index 2ed0e6b35..c503ecbda 100644 --- a/test/testpools.c +++ b/test/testpools.c @@ -90,7 +90,7 @@ static void pools1_execute(void) { test_assert(3, chPoolAlloc(&mp1) == NULL, "provider returned memory"); } -const struct testcase testpools1 = { +ROMCONST struct testcase testpools1 = { "Memory Pools, queue/dequeue", pools1_setup, NULL, @@ -102,7 +102,7 @@ const struct testcase testpools1 = { /* * @brief Test sequence for pools. */ -const struct testcase * const patternpools[] = { +ROMCONST struct testcase * ROMCONST patternpools[] = { #if CH_USE_MEMPOOLS &testpools1, #endif diff --git a/test/testpools.h b/test/testpools.h index 1d9d3e0d9..5f526f1d6 100644 --- a/test/testpools.h +++ b/test/testpools.h @@ -20,6 +20,6 @@ #ifndef _TESTPOOLS_H_ #define _TESTPOOLS_H_ -extern const struct testcase *patternpools[]; +extern ROMCONST struct testcase * ROMCONST patternpools[]; #endif /* _TESTPOOLS_H_ */ diff --git a/test/testqueues.c b/test/testqueues.c index 149c2a3c3..a9895a29a 100644 --- a/test/testqueues.c +++ b/test/testqueues.c @@ -129,7 +129,7 @@ static void queues1_execute(void) { test_assert(12, chIQGetTimeout(&iq, 10) == Q_TIMEOUT, "wrong timeout return"); } -const struct testcase testqueues1 = { +ROMCONST struct testcase testqueues1 = { "Queues, input queues", queues1_setup, NULL, @@ -189,7 +189,7 @@ static void queues2_execute(void) { test_assert(12, chOQPutTimeout(&oq, 0, 10) == Q_TIMEOUT, "wrong timeout return"); } -const struct testcase testqueues2 = { +ROMCONST struct testcase testqueues2 = { "Queues, output queues", queues2_setup, NULL, @@ -200,7 +200,7 @@ const struct testcase testqueues2 = { /** * @brief Test sequence for queues. */ -const struct testcase * const patternqueues[] = { +ROMCONST struct testcase * ROMCONST patternqueues[] = { #if CH_USE_QUEUES &testqueues1, &testqueues2, diff --git a/test/testqueues.h b/test/testqueues.h index c05d62641..1f86fc763 100644 --- a/test/testqueues.h +++ b/test/testqueues.h @@ -20,6 +20,6 @@ #ifndef _TESTQUEUES_H_ #define _TESTQUEUES_H_ -extern const struct testcase *patternqueues[]; +extern ROMCONST struct testcase * ROMCONST patternqueues[]; #endif /* _TESTQUEUES_H_ */ diff --git a/test/testsem.c b/test/testsem.c index 58d4e5e35..798e3a65d 100644 --- a/test/testsem.c +++ b/test/testsem.c @@ -103,7 +103,7 @@ static void sem1_execute(void) { #endif } -const struct testcase testsem1 = { +ROMCONST struct testcase testsem1 = { "Semaphores, enqueuing", sem1_setup, NULL, @@ -177,7 +177,7 @@ static void sem2_execute(void) { test_assert_time_window(11, target_time, target_time + ALLOWED_DELAY); } -const struct testcase testsem2 = { +ROMCONST struct testcase testsem2 = { "Semaphores, timeout", sem2_setup, NULL, @@ -222,7 +222,7 @@ static void sem3_execute(void) { test_assert(4, sem1.s_cnt == 0, "counter not zero"); } -const struct testcase testsem3 = { +ROMCONST struct testcase testsem3 = { "Semaphores, atomic signal-wait", sem3_setup, NULL, @@ -234,7 +234,7 @@ const struct testcase testsem3 = { /** * @brief Test sequence for semaphores. */ -const struct testcase * const patternsem[] = { +ROMCONST struct testcase * ROMCONST patternsem[] = { #if CH_USE_SEMAPHORES &testsem1, &testsem2, diff --git a/test/testsem.h b/test/testsem.h index 74a6f89bd..cfa3b6330 100644 --- a/test/testsem.h +++ b/test/testsem.h @@ -20,6 +20,6 @@ #ifndef _TESTSEM_H_ #define _TESTSEM_H_ -extern const struct testcase *patternsem[]; +extern ROMCONST struct testcase * ROMCONST patternsem[]; #endif /* _TESTSEM_H_ */ diff --git a/test/testthd.c b/test/testthd.c index 232ea7008..b12378320 100644 --- a/test/testthd.c +++ b/test/testthd.c @@ -77,7 +77,7 @@ static void thd1_execute(void) { test_assert_sequence(1, "ABCDE"); } -const struct testcase testthd1 = { +ROMCONST struct testcase testthd1 = { "Threads, enqueuing test #1", NULL, NULL, @@ -105,7 +105,7 @@ static void thd2_execute(void) { test_assert_sequence(1, "ABCDE"); } -const struct testcase testthd2 = { +ROMCONST struct testcase testthd2 = { "Threads, enqueuing test #2", NULL, NULL, @@ -170,7 +170,7 @@ static void thd3_execute(void) { #endif } -const struct testcase testthd3 = { +ROMCONST struct testcase testthd3 = { "Threads, priority change", NULL, NULL, @@ -211,7 +211,7 @@ static void thd4_execute(void) { test_assert_time_window(4, time, time + 1); } -const struct testcase testthd4 = { +ROMCONST struct testcase testthd4 = { "Threads, delays", NULL, NULL, @@ -221,7 +221,7 @@ const struct testcase testthd4 = { /** * @brief Test sequence for threads. */ -const struct testcase * const patternthd[] = { +ROMCONST struct testcase * ROMCONST patternthd[] = { &testthd1, &testthd2, &testthd3, diff --git a/test/testthd.h b/test/testthd.h index 5b71c98fb..e355f63fb 100644 --- a/test/testthd.h +++ b/test/testthd.h @@ -20,6 +20,6 @@ #ifndef _TESTRDY_H_ #define _TESTRDY_H_ -extern const struct testcase *patternthd[]; +extern ROMCONST struct testcase * ROMCONST patternthd[]; #endif /* _TESTRDY_H_ */ -- cgit v1.2.3