Skip to content

Commit a97a451

Browse files
authored
Merge pull request #1109 from IETS3/feature/RunConfigForJUnitInterpreterTests
Create a separate run configuration for JUnit interpreter tests
2 parents 48b7228 + b6cc507 commit a97a451

File tree

11 files changed

+14101
-9
lines changed

11 files changed

+14101
-9
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project are documented in this file.
55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
77

8+
## November 2024
9+
10+
### Added
11+
12+
- Execution of Test by Interpreter can be done without generation and compilation.
13+
14+
815
## October 2024
916

1017
### Fixed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ task buildLanguages(type: BuildLanguages, dependsOn: prebuild) {
224224
script "$buildDir/scripts/build-languages.xml"
225225
}
226226

227+
227228
task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
228229
script "$buildDir/scripts/build-tests.xml"
229230
doLast {
@@ -512,4 +513,4 @@ cyclonedxBom {
512513

513514
assemble {
514515
dependsOn('cyclonedxBom')
515-
}
516+
}

build/scripts/build-allScripts.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
6262
<language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
6363
<language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
64-
<language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
6564
<language id="l:9d000fbd-bdca-4a46-b39b-c5ba9e79b38c:org.iets3.opensource.build.gentests" />
6665
</uses>
6766
<classpath>
@@ -123,7 +122,6 @@
123122
<settings refid="m2m-0" />
124123
<plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.build" />
125124
<plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build" />
126-
<plugin path="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks" />
127125
<plugin path="${artifacts.mps}/plugins/mps-build" />
128126
<plugin path="${artifacts.mps}/plugins/mps-core" />
129127
<library file="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
@@ -331,7 +329,6 @@
331329
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
332330
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
333331
<fileset file="${artifacts.mps}/lib/stats.jar" />
334-
<fileset file="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.reflection.runtime.jar" />
335332
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
336333
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
337334
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.jar" />

code/languages/org.iets3.opensource/.mps/modules.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.units.interpreter/org.iets3.core.expr.typetags.units.interpreter.msd" folder="expr.lang-advanced" />
136136
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.units.si/org.iets3.core.expr.typetags.units.si.msd" folder="expr.lang-advanced" />
137137
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.util.interpreter/org.iets3.core.expr.util.interpreter.msd" folder="expr.lang-advanced" />
138+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.junit.interpreter.run.configuration/org.iets3.core.junit.interpreter.run.configuration.msd" folder="core" />
138139
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.allScripts.build/org.iets3.opensource.allScripts.build.msd" folder="_build" />
139140
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build.gentests.rt/org.iets3.opensource.build.gentests.rt.msd" folder="_build" />
140141
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd" folder="_build" />

code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/behavior.mps

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
66
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="2" />
77
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
8-
<use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
98
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
109
</languages>
1110
<imports>

code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/structure.mps

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<persistence version="9" />
44
<languages>
55
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
6-
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
76
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
87
</languages>
98
<imports>

code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/org.iets3.opensource.build.gentests.mpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
8585
</dependencies>
8686
<languageVersions>
87-
<language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
8887
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
8988
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
9089
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />

0 commit comments

Comments
 (0)