diff options
50 files changed, 426 insertions, 56 deletions
diff --git a/.gitignore b/.gitignore index 426460ec6..9805706a8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ language.settings.xml target/ xtend-gen/ build/ -.gradle/
\ No newline at end of file +.gradle/ +log/
\ No newline at end of file diff --git a/build.gradle b/build.gradle index 95680d357..2d21c1458 100644 --- a/build.gradle +++ b/build.gradle @@ -7,4 +7,9 @@ ext { etUnitConverter = "$rootDir/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle" etGenerator = "$rootDir/plugins/org.eclipse.etrice.generator/etGenerator.gradle" etTest = "$rootDir/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle" +} + +allprojects { + group = 'org.eclipse.etrice' + version = '1.0.0-SNAPSHOT' }
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 000000000..7a3265ee9 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..f16d26666 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip diff --git a/gradlew b/gradlew new file mode 100644 index 000000000..cccdd3d51 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..f9553162f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/plugins/build.gradle b/plugins/build.gradle index 46c7c1cde..3c483f924 100644 --- a/plugins/build.gradle +++ b/plugins/build.gradle @@ -1,7 +1,37 @@ subprojects { - repositories { + maven { + name 'Protos Nexus' + url 'http://10.8.1.101:8081/repository/maven-public' + } mavenCentral() } + apply plugin: 'maven-publish' + + publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + repositories { + maven { + name 'maven-snapshots' + url "http://10.8.1.101:8081/repository/maven-snapshots" + credentials { + username project.properties.nexusUser + password project.properties.nexusPassword + } + } + /*maven { + name 'maven-releases' + url "http://10.8.1.101:8081/repository/maven-releases" + credentials { + username properties.nexusUser + password properties.nexusPassword + } + }*/ + } + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle b/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle index 7055f05ff..35fa139f0 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle +++ b/plugins/org.eclipse.etrice.etunit.converter/etUnitConverter.gradle @@ -5,15 +5,15 @@ evaluationDependsOn(etUnitConverter) /** * Creates a tasks that converts etu files to xml files * @param name: The name of the new task - * @param etuFiles: The etu files to be converted + * @param options: The options passed to the converter */ -ext.createEtUnitConverterTask = { name, etuFiles, suiteName = null -> +ext.createEtUnitConverterTask = { name, etuFiles, options = [] -> def xmlFiles = etuFiles.collect { it.replace('.etu', '.xml') } return tasks.create(name: name, type: JavaExec, dependsOn: "$etUnitConverter:classes") { main = project(etUnitConverter).mainClassName classpath = project(etUnitConverter).sourceSets.main.runtimeClasspath - if(suiteName != null) args '-suite', suiteName + args options args etuFiles inputs.files etuFiles outputs.files xmlFiles diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml index 97dc48dfb..7b5e74df8 100644 --- a/releng/org.eclipse.etrice.parent/pom.xml +++ b/releng/org.eclipse.etrice.parent/pom.xml @@ -13,10 +13,12 @@ <xtext.version>2.10.0</xtext.version> <tycho.version>1.0.0</tycho.version> + <cbi.version>1.1.4</cbi.version> <eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.url> <license.url>http://download.eclipse.org/cbi/updates/license</license.url> <orbit.url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository</orbit.url> + <cbi.url>https://repo.eclipse.org/content/repositories/cbi-releases</cbi.url> </properties> <repositories> @@ -37,6 +39,37 @@ </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>cbi</id> + <url>${cbi.url}</url> + </pluginRepository> + </pluginRepositories> + + <profiles> + <profile> + <id>sign</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.cbi.maven.plugins</groupId> + <artifactId>eclipse-jarsigner-plugin</artifactId> + <version>${cbi.version}</version> + <executions> + <execution> + <id>sign</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <build> <plugins> <plugin> @@ -65,6 +98,40 @@ <outputDirectory>xtend-gen</outputDirectory> </configuration> </plugin> + <!-- plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + <configuration> + <environments> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin --> </plugins> </build> </project> diff --git a/tests/org.eclipse.etrice.generator.c.tests/.gitignore b/tests/org.eclipse.etrice.generator.c.tests/.gitignore index d2726d181..b45c5f774 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.c.tests/.gitignore @@ -1,2 +1 @@ -src-gen/ -output/
\ No newline at end of file +src-gen/
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room index 332f1c847..8091671e9 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room +++ b/tests/org.eclipse.etrice.generator.c.tests/models/SendingDataTest.room @@ -186,7 +186,7 @@ RoomModel SendingDataTest { StateMachine { Transition init: initial -> tp0 of state0 { action { - "caseId = etUnit_openAll(\".\", \"SendingDataTest\", \"org.eclipse.etrice.generator.c.tests.SendingDataTest\", \"SendingDataTest_case\");" + "caseId = etUnit_openAll(\"log\", \"SendingDataTest\", \"org.eclipse.etrice.generator.c.tests.SendingDataTest\", \"SendingDataTest_case\");" "EXPECT_ORDER_START(caseId,resultlist,23);" "EXPECT_ORDER(caseId,\"<|MODEL_LOCATION|>\", 1);" "/* send the default values */" diff --git a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room b/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room index 3c8518ee0..484f8ac0e 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room +++ b/tests/org.eclipse.etrice.generator.c.tests/models/StaticConfigTest.room @@ -22,7 +22,7 @@ RoomModel StaticConfigTest { } Behavior { ctor { - "etUnit_open(\".\", \"StaticConfigTest\");" + "etUnit_open(\"log\", \"StaticConfigTest\");" "etUnit_openTestSuite(\"org.eclipse.etrice.generator.c.tests.StaticConfigTest\");" } dtor { diff --git a/tests/org.eclipse.etrice.generator.common.tests/.gitignore b/tests/org.eclipse.etrice.generator.common.tests/.gitignore index d2726d181..b45c5f774 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.common.tests/.gitignore @@ -1,2 +1 @@ -src-gen/ -output/
\ No newline at end of file +src-gen/
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle b/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle index 7df62b1f4..86b7145c8 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle +++ b/tests/org.eclipse.etrice.generator.common.tests/etTest.gradle @@ -1,7 +1,7 @@ apply from: etGenerator apply from: etUnitConverter -def outputDir = 'output' +def outputDir = 'log' def srcGenDir = 'src-gen' clean.delete srcGenDir, outputDir @@ -34,7 +34,7 @@ ext.createTest = { lang, name, models, options = [] -> def suiteName = "${project.name}.$testNameCap" def genDir = "$srcGenDir/$testName" def workingDir = "$outputDir/$testName" - def etuFile = "$workingDir/${nameCap}.etu" + def etuFile = "$workingDir/log/${nameCap}.etu" def generateTask = createGeneratorTask("generate$testNameCap", lang, models, genDir, options) generateTask.environment 'etModellib', "org.eclipse.etrice.modellib.$lang" @@ -101,7 +101,7 @@ ext.createTest = { lang, name, models, options = [] -> runTask.doFirst { file("$workingDir/log").mkdirs() } - def convertTask = createEtUnitConverterTask("convert$testNameCap", etuFile, suiteName) + def convertTask = createEtUnitConverterTask("convert$testNameCap", etuFile, ['-suite', suiteName]) convertTask.dependsOn runTask check.dependsOn tasks.create(name: testName, dependsOn: convertTask, group: 'verification') diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room index e9929261f..9b51b0972 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/ActorCommunicationTest.room @@ -63,7 +63,7 @@ RoomModel ActorCommunicationTest { } Behavior { ctor { - "etUnit_open(\".\", \"ActorCommunicationTest\");" + "etUnit_open(\"log\", \"ActorCommunicationTest\");" "etUnit_openTestSuite(\"org.eclipse.etrice.generator.common.tests.ActorCommunicationTest\");" } dtor { diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room index c72dbc8de..92fc9fcbb 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTest.room @@ -26,7 +26,7 @@ RoomModel ChoicePointTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"ChoicePointTest\", \"org.eclipse.etrice.generator.common.tests.ChoicePointTest\", \"ChoicePointTest_case\");" + "caseId = etUnit_openAll(\"log\", \"ChoicePointTest\", \"org.eclipse.etrice.generator.common.tests.ChoicePointTest\", \"ChoicePointTest_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room index a87545e89..fe184e51e 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/ChoicePointTestExtended.room @@ -350,7 +350,7 @@ RoomModel ChoicePointTestExtended { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"ChoicePointTestExtended\", \"org.eclipse.etrice.generator.common.tests.ChoicePointTestExtended\", \"ChoicePointTest_case\");" + "caseId = etUnit_openAll(\"log\", \"ChoicePointTestExtended\", \"org.eclipse.etrice.generator.common.tests.ChoicePointTestExtended\", \"ChoicePointTest_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/CompileTests.room b/tests/org.eclipse.etrice.generator.common.tests/models/CompileTests.room index 16008a342..2819b53fd 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/CompileTests.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/CompileTests.room @@ -20,7 +20,7 @@ RoomModel CompileTests { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"CompileTests\", \"org.eclipse.etrice.generator.common.tests.CompileTests\", \"CompileTests_case\");" + "caseId = etUnit_openAll(\"log\", \"CompileTests\", \"org.eclipse.etrice.generator.common.tests.CompileTests\", \"CompileTests_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room index 87a002749..92141b100 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/DataDrivenTest.room @@ -68,7 +68,7 @@ RoomModel DataDrivenTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DataDrivenTest\", \"org.eclipse.etrice.generator.common.tests.DataDrivenTest\", \"DataDrivenTest_case\");" + "caseId = etUnit_openAll(\"log\", \"DataDrivenTest\", \"org.eclipse.etrice.generator.common.tests.DataDrivenTest\", \"DataDrivenTest_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room index b533ebf22..fa39886e8 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/EnumTest.room @@ -32,7 +32,7 @@ RoomModel EnumTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"EnumTest\", \"org.eclipse.etrice.generator.common.tests.EnumTest\", \"EnumTest_case\");" + "caseId = etUnit_openAll(\"log\", \"EnumTest\", \"org.eclipse.etrice.generator.common.tests.EnumTest\", \"EnumTest_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room index db3dff2cd..381ad7633 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/HandlerTest.room @@ -26,7 +26,7 @@ RoomModel HandlerTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"HandlerTest\", \"org.eclipse.etrice.generator.common.tests.HandlerTest\", \"HandlerTest_case\");" + "caseId = etUnit_openAll(\"log\", \"HandlerTest\", \"org.eclipse.etrice.generator.common.tests.HandlerTest\", \"HandlerTest_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room index f9fd340e8..f98190fcc 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/OperationInheritanceTest.room @@ -10,7 +10,7 @@ RoomModel OperationInheritanceTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"OperationInheritanceTest\", \"org.eclipse.etrice.generator.common.tests.OperationInheritanceTest\", \"OperationInheritanceTest_case\");" + "caseId = etUnit_openAll(\"log\", \"OperationInheritanceTest\", \"org.eclipse.etrice.generator.common.tests.OperationInheritanceTest\", \"OperationInheritanceTest_case\");" "ctorRefine = 2;" } dtor { diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room index ef057dd2c..f0e904bdb 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadReplPortTest.room @@ -54,7 +54,7 @@ RoomModel PingPongThreadReplPortTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"PingPongThreadReplPortTest\", \"org.eclipse.etrice.generator.common.tests.PingPongThreadTestReplPort\", \"PingPongThreadTestReplPort_case\");" + "caseId = etUnit_openAll(\"log\", \"PingPongThreadReplPortTest\", \"org.eclipse.etrice.generator.common.tests.PingPongThreadTestReplPort\", \"PingPongThreadTestReplPort_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room index e18c868d4..8a4f147ab 100644 --- a/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room +++ b/tests/org.eclipse.etrice.generator.common.tests/models/PingPongThreadTest.room @@ -56,7 +56,7 @@ RoomModel PingPongThreadTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"PingPongThreadTest\", \"org.eclipse.etrice.generator.common.tests.PingPongThreadTest\", \"PingPongThreadTest_case\");" + "caseId = etUnit_openAll(\"log\", \"PingPongThreadTest\", \"org.eclipse.etrice.generator.common.tests.PingPongThreadTest\", \"PingPongThreadTest_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore b/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore index d2726d181..b45c5f774 100644 --- a/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.cpp.tests/.gitignore @@ -1,2 +1 @@ -src-gen/ -output/
\ No newline at end of file +src-gen/
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room b/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room index 633aa3b95..7d1ccfb7f 100644 --- a/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room +++ b/tests/org.eclipse.etrice.generator.cpp.tests/models/InitializationTest.room @@ -45,7 +45,7 @@ RoomModel InitializationTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"InitializationTest\", \"org.eclipse.etrice.generator.cpp.tests.InitializationTest\", \"InitializationTest_case\");" + "caseId = etUnit_openAll(\"log\", \"InitializationTest\", \"org.eclipse.etrice.generator.cpp.tests.InitializationTest\", \"InitializationTest_case\");" "testInitValues(caseId);" } dtor { diff --git a/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room index c1558d539..b38d93c30 100644 --- a/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room +++ b/tests/org.eclipse.etrice.generator.cpp.tests/models/SendingDataTest.room @@ -186,7 +186,7 @@ RoomModel SendingDataTest { StateMachine { Transition init: initial -> tp0 of state0 { action { - "caseId = etUnit_openAll(\".\", \"SendingDataTest\", \"org.eclipse.etrice.generator.cpp.tests.SendingDataTest\", \"SendingDataTest_case\");" + "caseId = etUnit_openAll(\"log\", \"SendingDataTest\", \"org.eclipse.etrice.generator.cpp.tests.SendingDataTest\", \"SendingDataTest_case\");" "EXPECT_ORDER_START(caseId,resultlist,23);" "EXPECT_ORDER(caseId,\"<|MODEL_LOCATION|>\", 1);" "/* send the default values */" diff --git a/tests/org.eclipse.etrice.generator.java.tests/.gitignore b/tests/org.eclipse.etrice.generator.java.tests/.gitignore index d2726d181..b45c5f774 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/.gitignore +++ b/tests/org.eclipse.etrice.generator.java.tests/.gitignore @@ -1,2 +1 @@ -src-gen/ -output/
\ No newline at end of file +src-gen/
\ No newline at end of file diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room index 59c71cd68..9f393fd1a 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest1.room @@ -30,7 +30,7 @@ RoomModel DynamicActorTest1 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest1\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest1\", \"DynamicActorTest1_case\");" + "caseId = etUnit_openAll(\"log\", \"DynamicActorTest1\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest1\", \"DynamicActorTest1_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room index f47a1ec41..9893c7dbf 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest2.room @@ -30,7 +30,7 @@ RoomModel DynamicActorTest2 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest2\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest2\", \"DynamicActorTest2_case\");" + "caseId = etUnit_openAll(\"log\", \"DynamicActorTest2\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest2\", \"DynamicActorTest2_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room index 410f28772..152b36811 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest3.room @@ -22,7 +22,7 @@ RoomModel DynamicActorTest3 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest3\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest3\", \"DynamicActorTest3_case\");" + "caseId = etUnit_openAll(\"log\", \"DynamicActorTest3\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest3\", \"DynamicActorTest3_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room index 57a67add5..3deb03ddd 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest4.room @@ -21,7 +21,7 @@ RoomModel DynamicActorTest4 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest4\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest4\", \"DynamicActorTest4_case\");" + "caseId = etUnit_openAll(\"log\", \"DynamicActorTest4\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest4\", \"DynamicActorTest4_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room index 7c7b8c4a1..0a4d3d8c0 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest5.room @@ -21,7 +21,7 @@ RoomModel DynamicActorTest5 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest5\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest5\", \"DynamicActorTest5_case\");" + "caseId = etUnit_openAll(\"log\", \"DynamicActorTest5\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest5\", \"DynamicActorTest5_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room index 905f8c05d..174b03d01 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest6.room @@ -24,7 +24,7 @@ RoomModel DynamicActorTest6 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest6\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest6\", \"DynamicActorTest6_case\");" + "caseId = etUnit_openAll(\"log\", \"DynamicActorTest6\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest6\", \"DynamicActorTest6_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room index 8a5c7bba8..ec9aff939 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicActorTest7.room @@ -42,7 +42,7 @@ RoomModel DynamicActorTest7 { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"DynamicActorTest7\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest7\", \"DynamicActorTest7_case\");" + "caseId = etUnit_openAll(\"log\", \"DynamicActorTest7\", \"org.eclipse.etrice.generator.java.tests.DynamicActorTest7\", \"DynamicActorTest7_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room index 112e47693..9835b42af 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/DynamicConfigTest.room @@ -49,7 +49,7 @@ RoomModel DynamicConfigTest { } Behavior { ctor { - "etUnit_open(\".\", \"DynamicConfigTest\");" + "etUnit_open(\"log\", \"DynamicConfigTest\");" "etUnit_openTestSuite(\"org.eclipse.etrice.generator.java.tests.DynamicConfigTest\");" "caseId = etUnit_openTestCase(\"DynamicConfigTest_case_Testee_ac\");" } diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room index 2fdd40bdb..39a66aeee 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/SendingDataTest.room @@ -178,7 +178,7 @@ RoomModel SendingDataTest { StateMachine { Transition init: initial -> tp0 of state0 { action { - "caseId = etUnit_openAll(\".\", \"SendingDataTest\", \"org.eclipse.etrice.generator.java.tests.SendingDataTest\", \"SendingDataTest_case\");" + "caseId = etUnit_openAll(\"log\", \"SendingDataTest\", \"org.eclipse.etrice.generator.java.tests.SendingDataTest\", \"SendingDataTest_case\");" "EXPECT_ORDER_START(caseId,resultlist,23);" "EXPECT_ORDER(caseId,\"<|MODEL_LOCATION|>\", 1);" "// send the default values" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room index c76fe713e..b6242c9a1 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/StaticConfigTest.room @@ -22,7 +22,7 @@ RoomModel StaticConfigTest { } Behavior { ctor { - "etUnit_open(\".\", \"StaticConfigTest\");" + "etUnit_open(\"log\", \"StaticConfigTest\");" "etUnit_openTestSuite(\"org.eclipse.etrice.generator.java.tests.StaticConfigTest\");" } dtor { diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room index 757233bf1..7fab6d5cc 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/StoreRestoreTest.room @@ -117,7 +117,7 @@ RoomModel StoreRestoreTest { } Behavior { ctor { - "caseId = etUnit_openAll(\".\", \"StoreRestoreTest\", \"org.eclipse.etrice.generator.java.tests.StoreRestoreTest\", \"StoreRestoreTest_case\");" + "caseId = etUnit_openAll(\"log\", \"StoreRestoreTest\", \"org.eclipse.etrice.generator.java.tests.StoreRestoreTest\", \"StoreRestoreTest_case\");" } dtor { "etUnit_closeAll(caseId);" diff --git a/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room b/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room index 9227b9a29..5e2b2c4f3 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room +++ b/tests/org.eclipse.etrice.generator.java.tests/models/TCPTest.room @@ -41,7 +41,7 @@ RoomModel TCPTest { }
Behavior {
ctor {
- "caseId = etUnit_openAll(\".\", \"TCPTest\", \"org.eclipse.etrice.generator.java.tests.TCPTest\", \"TCPTest_case\");"
+ "caseId = etUnit_openAll(\"log\", \"TCPTest\", \"org.eclipse.etrice.generator.java.tests.TCPTest\", \"TCPTest_case\");"
}
dtor {
"etUnit_closeAll(caseId);"
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle index 4b711fc94..4a21f68db 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/build.gradle +++ b/tests/org.eclipse.etrice.runtime.c.tests/build.gradle @@ -17,13 +17,16 @@ model { } lib project: ':runtime:org.eclipse.etrice.runtime.c', library: 'etrice_runtime_c', linkage: 'static' } + binaries { + all { cppCompiler.args '-g3' } + } } } } def exeFile = "$buildDir/exe/etrice_runtime_c_tests/etrice_runtime_c_tests" -def etuFileRuntimeTest = 'log/testlog/TestCRuntime.etu' -def etuFileEtUnitTest = 'log/testlog/TestEtUnitSpecial.etu' +def etuFileRuntimeTest = 'log/TestCRuntime.etu' +def etuFileEtUnitTest = 'log/TestEtUnitSpecial.etu' clean.delete 'log' @@ -32,7 +35,7 @@ task run(type: Exec, dependsOn: assemble, group: 'verification') { inputs.file exeFile outputs.files etuFileRuntimeTest, etuFileEtUnitTest - doFirst { file('log/testlog').mkdirs() } + doFirst { file('log').mkdirs() } } createEtUnitConverterTask('convert', [etuFileRuntimeTest, etuFileEtUnitTest]) diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c index 16ad8a4da..d011b03e8 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/RunCRuntimeTestcases.c @@ -38,8 +38,8 @@ void RunCRuntimeTestcases(void){ etInt16 id; - etMSCLogger_open("log/testlog", "test.log"); - etUnit_open("log/testlog","TestCRuntime"); + etMSCLogger_open("log", "test.log"); + etUnit_open("log","TestCRuntime"); TestEtQueue_runSuite(); TestEtMemory_runSuite(); @@ -56,7 +56,7 @@ void RunCRuntimeTestcases(void){ /* special situation for testing openAll and closeAll of etUnit * this has to be done outside of etUnit_open and etUnit_close */ - id = etUnit_openAll("log/testlog","TestEtUnitSpecial", "etUnit", "org.eclipse.etrice.runtime.c.tests.openAll_and_closeAll"); + id = etUnit_openAll("log","TestEtUnitSpecial", "etUnit", "org.eclipse.etrice.runtime.c.tests.openAll_and_closeAll"); EXPECT_TRUE(id, "Open and Close", ET_TRUE); etUnit_closeAll(id); diff --git a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/util/TestUtil.c b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/util/TestUtil.c index da583e1de..6c6a5f4ea 100644 --- a/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/util/TestUtil.c +++ b/tests/org.eclipse.etrice.runtime.c.tests/src/runtime/util/TestUtil.c @@ -49,7 +49,7 @@ static void TestRandomGenerator (etInt16 id) { #endif void TestUtil_runSuite(void){ - etUnit_openTestSuite("TestUtil"); + etUnit_openTestSuite("org.eclipse.etrice.runtime.c.TestUtil"); #ifdef ET_FLOAT64 ADD_TESTCASE(TestRandomGenerator); diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle index d9d197a0c..6d0932b11 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/build.gradle @@ -18,12 +18,15 @@ model { lib project: ':runtime:org.eclipse.etrice.runtime.cpp', library: 'etrice_runtime_cpp', linkage: 'static' lib project: ':runtime:org.eclipse.etrice.runtime.c', library: 'etrice_runtime_c', linkage: 'static' } + binaries { + all { cppCompiler.args '-g3' } + } } } } def exeFile = "$buildDir/exe/etrice_runtime_cpp_tests/etrice_runtime_cpp_tests" -def etuFile = 'log/testlog/TestCppRuntime.etu' +def etuFile = 'log/TestCppRuntime.etu' clean.delete 'log' @@ -32,7 +35,7 @@ task run(type: Exec, dependsOn: assemble, group: 'verification') { inputs.file exeFile outputs.files etuFile - doFirst { file('log/testlog').mkdirs() } + doFirst { file('log').mkdirs() } } createEtUnitConverterTask('convert', etuFile) diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/RunAllTestCases.cpp b/tests/org.eclipse.etrice.runtime.cpp.tests/src/RunAllTestCases.cpp index 322ca7a2c..86376c989 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/RunAllTestCases.cpp +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/RunAllTestCases.cpp @@ -35,7 +35,7 @@ int main() { - etUnit_open("log/testlog", "TestCppRuntime"); + etUnit_open("log", "TestCppRuntime"); // Test containers StaticArrayTest staticArrayTest; diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/DebuggingServiceTest.cpp b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/DebuggingServiceTest.cpp index b04d03034..38ba09935 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/DebuggingServiceTest.cpp +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/DebuggingServiceTest.cpp @@ -32,7 +32,7 @@ void DebuggingServiceTest::testLogging() { Port port1(&actor1, "TestPort1"); Port port2(&actor2, "TestPort2"); DebuggingService& dbgSvc = DebuggingService::getInstance(); - dbgSvc.getAsyncLogger().setMSC("DebuggingServiceTest", "log/testlog/"); + dbgSvc.getAsyncLogger().setMSC("DebuggingServiceTest", "log/"); dbgSvc.getAsyncLogger().open(); InterfaceItemBase::connect(&subSystem, port1.getInstancePath(), diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFunctionObjectTest.cpp b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFunctionObjectTest.cpp index b7c8567f0..4096678fc 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFunctionObjectTest.cpp +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCFunctionObjectTest.cpp @@ -19,7 +19,7 @@ using namespace etRuntime; void MSCFunctionObjectTest::test() { DebuggingService::getInstance().getSyncLogger().setMSC( - "MSCFunctionObjectTest", "log/testlog/"); + "MSCFunctionObjectTest", "log/"); DebuggingService::getInstance().getSyncLogger().open(); DebuggingService::getInstance().getSyncLogger().setObjectName("main"); MSCFunctionObject* obj = new MSCFunctionObject("MSCFunctionObjectTest", diff --git a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCLoggerTest.cpp b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCLoggerTest.cpp index 01be8e936..6b2a68037 100644 --- a/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCLoggerTest.cpp +++ b/tests/org.eclipse.etrice.runtime.cpp.tests/src/debugging/MSCLoggerTest.cpp @@ -19,7 +19,7 @@ using namespace etRuntime; void MSCLoggerTest::testLogger() { MSCLogger logger; - logger.setMSC("MSCTest", "log/testlog/"); + logger.setMSC("MSCTest", "log/"); logger.open(); logger.addMessageAsyncOut("Source", "Target", "MessageAsync"); logger.addMessageAsyncIn("Source", "Target", "MessageAsync"); diff --git a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle index 8b221bf37..63cdcb3bd 100644 --- a/tests/org.eclipse.etrice.runtime.java.tests/build.gradle +++ b/tests/org.eclipse.etrice.runtime.java.tests/build.gradle @@ -13,4 +13,7 @@ dependencies { sourceSets.test.java.srcDirs = ['src'] -test.reports.html.enabled = false
\ No newline at end of file +test.reports.html.enabled = false +test.reports.junitXml.destination = file('log') + +clean.delete 'log'
\ No newline at end of file diff --git a/tests/pom.xml b/tests/pom.xml index 2614046e0..9ee1ea0a3 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -22,6 +22,7 @@ <version>${tycho.version}</version> <configuration> <failIfNoTests>false</failIfNoTests> + <reportsDirectory>log</reportsDirectory> </configuration> </plugin> </plugins> |