Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Schuetz2012-02-08 12:36:17 +0000
committerThomas Schuetz2012-02-08 12:36:17 +0000
commit07b15770cbb0a473df8184437f1c11766f3eb48a (patch)
tree23e5c34a3b9fbb7670b1f847c33a5711824dc5ea /runtime
parent7abca25df669a9fd305368dc667c2fe30559c9ae (diff)
downloadorg.eclipse.etrice-07b15770cbb0a473df8184437f1c11766f3eb48a.tar.gz
org.eclipse.etrice-07b15770cbb0a473df8184437f1c11766f3eb48a.tar.xz
org.eclipse.etrice-07b15770cbb0a473df8184437f1c11766f3eb48a.zip
[test.common] bash script test-launcher.sh for running and checking etUnit testcases
Diffstat (limited to 'runtime')
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.abin129536 -> 129592 bytes
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c10
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h1
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/etUnit.c2
4 files changed, 6 insertions, 7 deletions
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
--- 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
Binary files 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<testcase name=\"%s\" classname=\"none\" time=\"%ld\">\n\t\t<failure>%s</failure>\n\t</testcase>\n",
+ "\t\t<testcase name=\"%s\" classname=\"none\" time=\"%ld\">\n\t\t\t<failure>%s</failure>\n\t\t</testcase>\n",
testcase, time, resulttext);
}
}

Back to the top