Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-05-03 08:06:01 +0000
committerHenrik Rentz-Reichert2013-05-03 08:06:01 +0000
commit6703890a8bc841dc6dfe7fbfaff8aa41daeb0d24 (patch)
treee95c1b8e23fb7917ce97172458ea4316888f30a4 /tests/org.eclipse.etrice.runtime.c.tests/tmp
parent542803b0983becd79ff95133bec44526c03b7adc (diff)
parent3f26e81bc9be937a2f6c0bf765628093e6eda05b (diff)
downloadorg.eclipse.etrice-6703890a8bc841dc6dfe7fbfaff8aa41daeb0d24.tar.gz
org.eclipse.etrice-6703890a8bc841dc6dfe7fbfaff8aa41daeb0d24.tar.xz
org.eclipse.etrice-6703890a8bc841dc6dfe7fbfaff8aa41daeb0d24.zip
Merge remote branch 'origin/CGenPhysical' into CGenPhysical
Conflicts: tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestCRuntime.etu
Diffstat (limited to 'tests/org.eclipse.etrice.runtime.c.tests/tmp')
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestCRuntime.etu15
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestEtUnitSpecial.etu4
2 files changed, 15 insertions, 4 deletions
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestCRuntime.etu b/tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestCRuntime.etu
index ebfaba24c..770a013c8 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestCRuntime.etu
+++ b/tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestCRuntime.etu
@@ -6,7 +6,7 @@ ts start: TestMemory
tc start 2: TestEtMemory_testFixedSize
tc end 2: 10
tc start 3: TestEtMemory_testFreeList
-tc end 3: 0
+tc end 3: 4
ts start: TestMessage
tc start 4: TestEtMessage_testBasicMessage
tc end 4: 0
@@ -18,8 +18,19 @@ tc end 6: 21
ts start: TestEtUnit
tc start 7: TestEtUnit_Expect_Order
tc end 7: 0
-tc start 8: TestEtUnit_Expect
+tc start 8: TestEtMessageService_GetPushPopReturn
tc end 8: 0
+tc start 9: TestEtMessageService_GetReturn
+tc end 9: 0
+tc start 10: TestEtMessageService_execute
+tc end 10: 100
+tc start 11: TestEtMessageService_getMessagePoolLowWaterMark
+tc end 11: 0
+ts start: TestEtUnit
+tc start 12: TestEtUnit_Expect_Order
+tc end 12: 0
+tc start 13: TestEtUnit_Expect
+tc end 13: 0
ts start: TestEtTimer
tc start 9: TestEtTimer_lifecycle
tc end 9: 1501
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestEtUnitSpecial.etu b/tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestEtUnitSpecial.etu
index 78f14cc25..1da4cc53a 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestEtUnitSpecial.etu
+++ b/tests/org.eclipse.etrice.runtime.c.tests/tmp/testlog/TestEtUnitSpecial.etu
@@ -1,4 +1,4 @@
etUnit report
ts start: etUnit
-tc start 11: openAll and closeAll
-tc end 11: 0
+tc start 18: openAll and closeAll
+tc end 18: 0

Back to the top