From 07b15770cbb0a473df8184437f1c11766f3eb48a Mon Sep 17 00:00:00 2001 From: Thomas Schuetz Date: Wed, 8 Feb 2012 13:36:17 +0100 Subject: [test.common] bash script test-launcher.sh for running and checking etUnit testcases --- .../Debug/liborg.eclipse.etrice.runtime.c.a | Bin 129536 -> 129592 bytes .../src/etMessageQueue.c | 10 +++++----- .../src/etMessageService.h | 1 - runtime/org.eclipse.etrice.runtime.c/src/etUnit.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) (limited to 'runtime') diff --git a/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a b/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a index 3ab946646..9ee693e9a 100644 Binary files a/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a and b/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a differ diff --git a/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c b/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c index 27c949bd1..2e2e7edf6 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c +++ b/runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c @@ -69,31 +69,31 @@ etMessage* etMessageQueue_pop(etMessageQueue* self){ } etInt16 etMessageQueue_getSize(etMessageQueue* self) { - ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "init") + ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "getSize") ET_MSC_LOGGER_SYNC_EXIT return self->size; } etMessage* etMessageQueue_getFirst(etMessageQueue* self){ - ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "init") + ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "getFirst") ET_MSC_LOGGER_SYNC_EXIT return self->first; } etMessage* etMessageQueue_getLast(etMessageQueue* self){ - ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "init") + ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "getLast") ET_MSC_LOGGER_SYNC_EXIT return self->last; } etBool etMessageQueue_isNotEmpty(etMessageQueue* self){ - ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "init") + ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "isNotEmpty") ET_MSC_LOGGER_SYNC_EXIT return self->last != NULL; } etInt16 etMessageQueue_getHightWaterMark(etMessageQueue* self) { - ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "init") + ET_MSC_LOGGER_SYNC_ENTRY("etMessageQueue", "getHightWaterMark") ET_MSC_LOGGER_SYNC_EXIT return self->highWaterMark; } diff --git a/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h b/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h index 8c976f779..b7c46060c 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h +++ b/runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h @@ -44,5 +44,4 @@ void etMessageService_returnMessageBuffer(etMessageService* self, etMessage* buf void etMessageService_execute(etMessageService* self); - #endif /* RMESSAGESERVICE_H_ */ diff --git a/runtime/org.eclipse.etrice.runtime.c/src/etUnit.c b/runtime/org.eclipse.etrice.runtime.c/src/etUnit.c index 405c3d6ac..f9a963664 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/etUnit.c +++ b/runtime/org.eclipse.etrice.runtime.c/src/etUnit.c @@ -307,7 +307,7 @@ void etUnit_buildTestLogXML(char* xml, const char *testcase, etBool result, cons } else { sprintf( xml, - "\t\t\n\t\t%s\n\t\n", + "\t\t\n\t\t\t%s\n\t\t\n", testcase, time, resulttext); } } -- cgit v1.2.3