Skip to content

Commit d15222c

Browse files
Merge pull request #399 from mbeddr/merge/MPS-2024.3
Merge maintenance/MPS-2024.1 into maintenance/MPS-2024.3
2 parents cc8ceaf + b842bbb commit d15222c

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
@@ -3371,7 +3371,70 @@
33713371
</node>
33723372
</node>
33733373
</node>
3374-
<node concept="3o6iSG" id="HwplGLJjvj" role="3o6s8t" />
3374+
<node concept="2pNNFK" id="KUYoaWY$dK" role="3o6s8t">
3375+
<property role="2pNNFO" value="project" />
3376+
<node concept="2pNUuL" id="KUYoaWYANR" role="2pNNFR">
3377+
<property role="2pNUuO" value="path" />
3378+
<node concept="2pMdtt" id="KUYoaWYANS" role="2pMdts">
3379+
<property role="2pMdty" value="${basedir}" />
3380+
<node concept="17Uvod" id="KUYoaWYPa4" role="lGtFl">
3381+
<property role="2qtEX9" value="text" />
3382+
<property role="P4ACc" value="479c7a8c-02f9-43b5-9139-d910cb22f298/6666499814681541919/6666499814681541920" />
3383+
<node concept="3zFVjK" id="KUYoaWYPa5" role="3zH0cK">
3384+
<node concept="3clFbS" id="KUYoaWYPa6" role="2VODD2">
3385+
<node concept="3cpWs8" id="KUYoaWYPr3" role="3cqZAp">
3386+
<node concept="3cpWsn" id="KUYoaWYPr4" role="3cpWs9">
3387+
<property role="TrG5h" value="projectPath" />
3388+
<node concept="3Tqbb2" id="KUYoaWYPr5" role="1tU5fm">
3389+
<ref role="ehGHo" to="3ior:6qcrfIJFdKY" resolve="BuildSourcePath" />
3390+
</node>
3391+
<node concept="2OqwBi" id="KUYoaWYPr6" role="33vP2m">
3392+
<node concept="2OqwBi" id="KUYoaWYPr7" role="2Oq$k0">
3393+
<node concept="30H73N" id="KUYoaWYPr8" role="2Oq$k0" />
3394+
<node concept="3TrEf2" id="KUYoaWYPr9" role="2OqNvi">
3395+
<ref role="3Tt5mk" to="5tjl:5I1s5NvGLlK" resolve="options" />
3396+
</node>
3397+
</node>
3398+
<node concept="3TrEf2" id="KUYoaWYPra" role="2OqNvi">
3399+
<ref role="3Tt5mk" to="5tjl:6US8dKph52U" resolve="projectPath" />
3400+
</node>
3401+
</node>
3402+
</node>
3403+
</node>
3404+
<node concept="3clFbJ" id="KUYoaWYPrb" role="3cqZAp">
3405+
<node concept="3clFbS" id="KUYoaWYPrc" role="3clFbx">
3406+
<node concept="3cpWs6" id="KUYoaWYPrY" role="3cqZAp">
3407+
<node concept="2OqwBi" id="KUYoaWYPs0" role="3cqZAk">
3408+
<node concept="37vLTw" id="KUYoaWYPs1" role="2Oq$k0">
3409+
<ref role="3cqZAo" node="KUYoaWYPr4" resolve="projectPath" />
3410+
</node>
3411+
<node concept="2qgKlT" id="5q_BJsUw8pE" role="2OqNvi">
3412+
<ref role="37wK5l" to="vbkb:7ro1ZztyOh5" resolve="getAntPath" />
3413+
<node concept="2YIFZM" id="5q_BJsUwcJq" role="37wK5m">
3414+
<ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
3415+
<ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
3416+
<node concept="1iwH7S" id="5q_BJsUwdKu" role="37wK5m" />
3417+
</node>
3418+
</node>
3419+
</node>
3420+
</node>
3421+
</node>
3422+
<node concept="3y3z36" id="KUYoaWYPs5" role="3clFbw">
3423+
<node concept="10Nm6u" id="KUYoaWYPs6" role="3uHU7w" />
3424+
<node concept="37vLTw" id="KUYoaWYPs7" role="3uHU7B">
3425+
<ref role="3cqZAo" node="KUYoaWYPr4" resolve="projectPath" />
3426+
</node>
3427+
</node>
3428+
</node>
3429+
<node concept="3clFbF" id="KUYoaWYPs8" role="3cqZAp">
3430+
<node concept="3zGtF$" id="KUYoaWYPs9" role="3clFbG" />
3431+
</node>
3432+
</node>
3433+
</node>
3434+
</node>
3435+
</node>
3436+
</node>
3437+
</node>
33753438
<node concept="2pNNFK" id="HwplGLEVth" role="3o6s8t">
33763439
<property role="2pNNFO" value="testmodules" />
33773440
<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
@@ -335,7 +335,7 @@
335335
<plugin id="jetbrains.mps.junit5" path="${artifacts.mps}/plugins/mps-junit5" />
336336
<plugin id="jetbrains.mps.testing" path="${artifacts.mps}/plugins/mps-testing" />
337337
<macro name="mpsqa.home" path="${mpsqa.home}" />
338-
338+
<project path="${basedir}" />
339339
<testmodules>
340340
<path refid="mps.tests.path" />
341341
</testmodules>

0 commit comments

Comments
 (0)