Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Schuetz2012-03-19 16:21:36 -0400
committerThomas Schuetz2012-03-19 16:21:36 -0400
commitd30f118334eca86462816f082718503cadc3049d (patch)
tree5ba7d355c7cebbf9a63b12754742ffcf594ad746
parent47712bfedcd394935f7084dcdaf06983cd28c2f1 (diff)
downloadorg.eclipse.etrice-d30f118334eca86462816f082718503cadc3049d.tar.gz
org.eclipse.etrice-d30f118334eca86462816f082718503cadc3049d.tar.xz
org.eclipse.etrice-d30f118334eca86462816f082718503cadc3049d.zip
[generator.c.reference] moved runtime testcases to runtime.c.tests
-rw-r--r--examples/org.eclipse.etrice.generator.c.reference/.cproject20
-rw-r--r--examples/org.eclipse.etrice.generator.c.reference/.project4
-rw-r--r--examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/MSCLogTest.c28
-rw-r--r--examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/MSCLogger.seq15
-rw-r--r--examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c43
-rw-r--r--examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.h27
-rw-r--r--examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/test.c0
-rw-r--r--examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/test.h29
8 files changed, 18 insertions, 148 deletions
diff --git a/examples/org.eclipse.etrice.generator.c.reference/.cproject b/examples/org.eclipse.etrice.generator.c.reference/.cproject
index f0ae9433f..87a30e9d6 100644
--- a/examples/org.eclipse.etrice.generator.c.reference/.cproject
+++ b/examples/org.eclipse.etrice.generator.c.reference/.cproject
@@ -18,10 +18,18 @@
<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.54263550." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.918285240" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.1377401325" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
- <builder buildPath="${workspace_loc:/org.eclipse.etrice.generator.c.reference/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1914462916" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+ <builder buildPath="${workspace_loc:/org.eclipse.etrice.generator.c.reference/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1914462916" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base">
+ <outputEntries>
+ <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="Debug"/>
+ <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="Release"/>
+ </outputEntries>
+ </builder>
<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.2128193487" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
<option id="gnu.both.asm.option.include.paths.646571697" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.generator.c.reference/org.eclipse.etrice.runtime.c}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.generator.c.reference/org.eclipse.etrice.runtime.c/src/common}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.generator.c.reference/org.eclipse.etrice.runtime.c/src/platforms/generic}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1636502349" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
@@ -34,8 +42,10 @@
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.mingw.exe.debug.option.optimization.level.836528711" name="Optimization Level" superClass="gnu.c.compiler.mingw.exe.debug.option.optimization.level" valueType="enumerated"/>
<option id="gnu.c.compiler.mingw.exe.debug.option.debugging.level.1206340557" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<option id="gnu.c.compiler.option.include.paths.937550345" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/src/common}&quot;"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c/src/platforms/generic}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.runtime.c}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.generator.c.reference/org.eclipse.etrice.runtime.c}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.generator.c.reference/org.eclipse.etrice.runtime.c/src/common}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.eclipse.etrice.generator.c.reference/org.eclipse.etrice.runtime.c/src/platforms/generic}&quot;"/>
</option>
<option id="gnu.c.compiler.option.misc.other.674019116" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -Wconversion" valueType="string"/>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.215126527" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
@@ -57,13 +67,12 @@
</folderInfo>
<sourceEntries>
<entry excluding="src-gen|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
- <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src-gen"/>
</sourceEntries>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
- <externalSettings containerId="org.eclipse.etrice.runtime.c;cdt.managedbuild.config.gnu.mingw.lib.debug.505530637" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
+ <externalSettings containerId="org.eclipse.etrice.runtime.c;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
<externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/org.eclipse.etrice.runtime.c"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/org.eclipse.etrice.runtime.c/Debug"/>
@@ -124,7 +133,6 @@
</folderInfo>
<sourceEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src-gen"/>
- <entry excluding="runtime/RMessageQueue.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
<entry excluding="src-gen|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
diff --git a/examples/org.eclipse.etrice.generator.c.reference/.project b/examples/org.eclipse.etrice.generator.c.reference/.project
index 70dbc28ea..2b65e54e1 100644
--- a/examples/org.eclipse.etrice.generator.c.reference/.project
+++ b/examples/org.eclipse.etrice.generator.c.reference/.project
@@ -11,6 +11,10 @@
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
+ <key>?children?</key>
+ <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
+ </dictionary>
+ <dictionary>
<key>?name?</key>
<value></value>
</dictionary>
diff --git a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/MSCLogTest.c b/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/MSCLogTest.c
deleted file mode 100644
index 9321b8c55..000000000
--- a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/MSCLogTest.c
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#include "debugging/etLogger.h"
-#include "debugging/etMSCLogger.h"
-
-void Class2_ff(void) {
- ET_MSC_LOGGER_SYNC_ENTRY("Class2", "ff")
-
- ET_MSC_LOGGER_SYNC_EXIT
-}
-
-void CLass1_f(void) {
- ET_MSC_LOGGER_SYNC_ENTRY("Class1", "f")
- Class2_ff();
- ET_MSC_LOGGER_SYNC_EXIT
-}
-
-//int main(void) {
-//
-// etLogger_logInfo("*** T H E B E G I N ***");
-//
-// ET_MSC_LOGGER_OPEN("main");
-// CLass1_f();
-// ET_MSC_LOGGER_CLOSE
-//
-// etLogger_logInfo("*** T H E E N D ***");
-//
-// return 0;
-//}
diff --git a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/MSCLogger.seq b/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/MSCLogger.seq
deleted file mode 100644
index 6f3238570..000000000
--- a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/MSCLogger.seq
+++ /dev/null
@@ -1,15 +0,0 @@
-! a
-! b
-0004 a ==> b
-! d
-0006 d ==> b
-0007 b >>> State1
-! c
-0009 b ==> c
-0010 b <== c
-0011 a <== b
-! /MainComponent
-! /MainComponent/services
-...
-0015 [Data=1111] /MainComponent >-- /MainComponent/services executeInitialTransition
-0016 [Data=1234] /MainComponent --> /MainComponent/services executeInitialTransition
diff --git a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c b/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c
deleted file mode 100644
index 5a529aa03..000000000
--- a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * CONTRIBUTORS:
- * Thomas Schuetz (initial contribution)
- *
- *******************************************************************************/
-
-#include "debugging/etLogger.h"
-
-typedef struct SubSystem {
- char *name;
-} SubSystem;
-
-static SubSystem SubSystemInst = {"SubSystem"};
-
-void SubSystem_init(void){
- etLogger_logInfoF("%s_init", SubSystemInst.name);
-}
-
-void SubSystem_start(void){
- etLogger_logInfoF("%s_start", SubSystemInst.name);
-}
-
-void SubSystem_Scheduler(void){
- int32 i;
- for (i=0; i<100; i++){
- etLogger_logInfoF("%s Scheduler tick %d", SubSystemInst.name, i);
- }
-}
-
-void SubSystem_stop(void){
- etLogger_logInfoF("%s_stop", SubSystemInst.name);
-}
-
-void SubSystem_destroy(void){
- etLogger_logInfoF("%s_destroy", SubSystemInst.name);
-}
-
diff --git a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.h b/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.h
deleted file mode 100644
index 676bd1d5f..000000000
--- a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * CONTRIBUTORS:
- * Thomas Schuetz (initial contribution)
- *
- *******************************************************************************/
-
-
-
-#ifndef _SUBSYSTEM_H_
-#define _SUBSYSTEM_H_
-
-void SubSystem_init(void); // lifecycle init
-void SubSystem_start(void); // lifecycle start
-
-void SubSystem_Scheduler(void);
-
-void SubSystem_stop(void); // lifecycle stop
-void SubSystem_destroy(void); // lifecycle destroy
-
-
-#endif /* _SUBSYSTEM_H_ */
diff --git a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/test.c b/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/test.c
deleted file mode 100644
index e69de29bb..000000000
--- a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/test.c
+++ /dev/null
diff --git a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/test.h b/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/test.h
deleted file mode 100644
index 0846564bc..000000000
--- a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/test.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-typedef struct MyActor MyActor;
-
-typedef struct MyActor_const {
- const MyActor* actor;
-}MyActor_const;
-
-struct MyActor {
- const MyActor_const* constData;
-};
-
-static MyActor Actor1;
-static MyActor Actor2;
-
-static const MyActor_const Actor1_const = {&Actor1};
-static const MyActor_const Actor2_const = {&Actor2};
-
-static MyActor Actor1 = {&Actor1_const};
-static MyActor Actor2 = {&Actor2_const};;
-
-
-//*****************************
-enum ProtocolName_MsgIds {
- ProtocolName_
-};
-
-

Back to the top