Skip to content

Commit e0efb9e

Browse files
Merge pull request #400 from mbeddr/merge/MPS-2025.1
Merge maintenance/MPS-2024.3 into maintenance/MPS-2025.1
2 parents e0963c6 + d15222c commit e0efb9e

File tree

2 files changed

+65
-2
lines changed

2 files changed

+65
-2
lines changed

code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3302,7 +3302,70 @@
33023302
</node>
33033303
</node>
33043304
</node>
3305-
<node concept="3o6iSG" id="HwplGLJjvj" role="3o6s8t" />
3305+
<node concept="2pNNFK" id="KUYoaWY$dK" role="3o6s8t">
3306+
<property role="2pNNFO" value="project" />
3307+
<node concept="2pNUuL" id="KUYoaWYANR" role="2pNNFR">
3308+
<property role="2pNUuO" value="path" />
3309+
<node concept="2pMdtt" id="KUYoaWYANS" role="2pMdts">
3310+
<property role="2pMdty" value="${basedir}" />
3311+
<node concept="17Uvod" id="KUYoaWYPa4" role="lGtFl">
3312+
<property role="2qtEX9" value="text" />
3313+
<property role="P4ACc" value="479c7a8c-02f9-43b5-9139-d910cb22f298/6666499814681541919/6666499814681541920" />
3314+
<node concept="3zFVjK" id="KUYoaWYPa5" role="3zH0cK">
3315+
<node concept="3clFbS" id="KUYoaWYPa6" role="2VODD2">
3316+
<node concept="3cpWs8" id="KUYoaWYPr3" role="3cqZAp">
3317+
<node concept="3cpWsn" id="KUYoaWYPr4" role="3cpWs9">
3318+
<property role="TrG5h" value="projectPath" />
3319+
<node concept="3Tqbb2" id="KUYoaWYPr5" role="1tU5fm">
3320+
<ref role="ehGHo" to="3ior:6qcrfIJFdKY" resolve="BuildSourcePath" />
3321+
</node>
3322+
<node concept="2OqwBi" id="KUYoaWYPr6" role="33vP2m">
3323+
<node concept="2OqwBi" id="KUYoaWYPr7" role="2Oq$k0">
3324+
<node concept="30H73N" id="KUYoaWYPr8" role="2Oq$k0" />
3325+
<node concept="3TrEf2" id="KUYoaWYPr9" role="2OqNvi">
3326+
<ref role="3Tt5mk" to="5tjl:5I1s5NvGLlK" resolve="options" />
3327+
</node>
3328+
</node>
3329+
<node concept="3TrEf2" id="KUYoaWYPra" role="2OqNvi">
3330+
<ref role="3Tt5mk" to="5tjl:6US8dKph52U" resolve="projectPath" />
3331+
</node>
3332+
</node>
3333+
</node>
3334+
</node>
3335+
<node concept="3clFbJ" id="KUYoaWYPrb" role="3cqZAp">
3336+
<node concept="3clFbS" id="KUYoaWYPrc" role="3clFbx">
3337+
<node concept="3cpWs6" id="KUYoaWYPrY" role="3cqZAp">
3338+
<node concept="2OqwBi" id="KUYoaWYPs0" role="3cqZAk">
3339+
<node concept="37vLTw" id="KUYoaWYPs1" role="2Oq$k0">
3340+
<ref role="3cqZAo" node="KUYoaWYPr4" resolve="projectPath" />
3341+
</node>
3342+
<node concept="2qgKlT" id="5q_BJsUw8pE" role="2OqNvi">
3343+
<ref role="37wK5l" to="vbkb:7ro1ZztyOh5" resolve="getAntPath" />
3344+
<node concept="2YIFZM" id="5q_BJsUwcJq" role="37wK5m">
3345+
<ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
3346+
<ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
3347+
<node concept="1iwH7S" id="5q_BJsUwdKu" role="37wK5m" />
3348+
</node>
3349+
</node>
3350+
</node>
3351+
</node>
3352+
</node>
3353+
<node concept="3y3z36" id="KUYoaWYPs5" role="3clFbw">
3354+
<node concept="10Nm6u" id="KUYoaWYPs6" role="3uHU7w" />
3355+
<node concept="37vLTw" id="KUYoaWYPs7" role="3uHU7B">
3356+
<ref role="3cqZAo" node="KUYoaWYPr4" resolve="projectPath" />
3357+
</node>
3358+
</node>
3359+
</node>
3360+
<node concept="3clFbF" id="KUYoaWYPs8" role="3cqZAp">
3361+
<node concept="3zGtF$" id="KUYoaWYPs9" role="3clFbG" />
3362+
</node>
3363+
</node>
3364+
</node>
3365+
</node>
3366+
</node>
3367+
</node>
3368+
</node>
33063369
<node concept="2pNNFK" id="HwplGLEVth" role="3o6s8t">
33073370
<property role="2pNNFO" value="testmodules" />
33083371
<node concept="3o6iSG" id="HwplGLEW5T" role="3o6s8t" />

code/languages/org.mpsqa.testing/sandbox/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
<plugin id="jetbrains.mps.junit5" path="${artifacts.mps}/plugins/mps-junit5" />
338338
<plugin id="jetbrains.mps.testing" path="${artifacts.mps}/plugins/mps-testing" />
339339
<macro name="mpsqa.home" path="${mpsqa.home}" />
340-
340+
<project path="${basedir}" />
341341
<testmodules>
342342
<path refid="mps.tests.path" />
343343
</testmodules>

0 commit comments

Comments
 (0)