Skip to content

Commit

Permalink
Merge pull request #1109 from IETS3/feature/RunConfigForJUnitInterpre…
Browse files Browse the repository at this point in the history
…terTests

Create a separate run configuration for JUnit interpreter tests
  • Loading branch information
mgronover authored Dec 4, 2024
2 parents 48b7228 + b6cc507 commit a97a451
Show file tree
Hide file tree
Showing 11 changed files with 14,101 additions and 9 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project are documented in this file.
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.

## November 2024

### Added

- Execution of Test by Interpreter can be done without generation and compilation.


## October 2024

### Fixed
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ task buildLanguages(type: BuildLanguages, dependsOn: prebuild) {
script "$buildDir/scripts/build-languages.xml"
}


task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
script "$buildDir/scripts/build-tests.xml"
doLast {
Expand Down Expand Up @@ -512,4 +513,4 @@ cyclonedxBom {

assemble {
dependsOn('cyclonedxBom')
}
}
3 changes: 0 additions & 3 deletions build/scripts/build-allScripts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
<language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
<language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
<language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
<language id="l:9d000fbd-bdca-4a46-b39b-c5ba9e79b38c:org.iets3.opensource.build.gentests" />
</uses>
<classpath>
Expand Down Expand Up @@ -123,7 +122,6 @@
<settings refid="m2m-0" />
<plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.build" />
<plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build" />
<plugin path="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks" />
<plugin path="${artifacts.mps}/plugins/mps-build" />
<plugin path="${artifacts.mps}/plugins/mps-core" />
<library file="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
Expand Down Expand Up @@ -331,7 +329,6 @@
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
<fileset file="${artifacts.mps}/lib/stats.jar" />
<fileset file="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.reflection.runtime.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.jar" />
Expand Down
1 change: 1 addition & 0 deletions code/languages/org.iets3.opensource/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.units.interpreter/org.iets3.core.expr.typetags.units.interpreter.msd" folder="expr.lang-advanced" />
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.units.si/org.iets3.core.expr.typetags.units.si.msd" folder="expr.lang-advanced" />
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.util.interpreter/org.iets3.core.expr.util.interpreter.msd" folder="expr.lang-advanced" />
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.junit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd" folder="core" />
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.allScripts.build/org.iets3.opensource.allScripts.build.msd" folder="_build" />
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build.gentests.rt/org.iets3.opensource.build.gentests.rt.msd" folder="_build" />
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd" folder="_build" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
<use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<persistence version="9" />
<languages>
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
</languages>
<imports>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
</dependencies>
<languageVersions>
<language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
Expand Down
Loading

0 comments on commit a97a451

Please sign in to comment.