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

2 files changed, 12 insertions, 6 deletions

diff --git a/test/test.c b/test/test.c
index f1df08390..41662308c 100644
--- a/test/test.c
+++ b/test/test.c
@@ -328,9 +328,9 @@ msg_t TestThread(void *p) {
   test_println("***");

   test_print("*** Kernel:       ");

   test_println(CH_KERNEL_VERSION);

-#ifdef __GNUC__

-  test_print("*** GCC Version:  ");

-  test_println(__VERSION__);

+#ifdef CH_COMPILER_NAME

+  test_print("*** Compiler:     ");

+  test_println(CH_COMPILER_NAME);

 #endif

   test_print("*** Architecture: ");

   test_println(CH_ARCHITECTURE_NAME);

@@ -338,6 +338,10 @@ msg_t TestThread(void *p) {
   test_print("*** Core Variant: ");

   test_println(CH_CORE_VARIANT_NAME);

 #endif

+#ifdef CH_PORT_INFO

+  test_print("*** Port Info:    ");

+  test_println(CH_PORT_INFO);

+#endif

 #ifdef PLATFORM_NAME

   test_print("*** Platform:     ");

   test_println(PLATFORM_NAME);

diff --git a/test/testbmk.c b/test/testbmk.c
index 6c878f557..54da81fd8 100644
--- a/test/testbmk.c
+++ b/test/testbmk.c
@@ -635,9 +635,11 @@ ROMCONST struct testcase testbmk12 = {
 static void bmk13_execute(void) {

 

   test_print("--- System: ");

-  test_printn(sizeof(ReadyList) + sizeof(VTList) + IDLE_THREAD_STACK_SIZE +

-              (sizeof(Thread) + sizeof(struct intctx) + sizeof(struct extctx) +

-               INT_REQUIRED_STACK) * 2);

+  test_printn(sizeof(ReadyList) + sizeof(VTList) +

+              PORT_IDLE_THREAD_STACK_SIZE +

+              (sizeof(Thread) + sizeof(struct intctx) +

+               sizeof(struct extctx) +

+               PORT_INT_REQUIRED_STACK) * 2);

   test_println(" bytes");

   test_print("--- Thread: ");

   test_printn(sizeof(Thread));