Skip to content

Commit dc90402

Browse files
maros-sandormaros-sandor
committed
Merge branch '2022.3' into 2023.2
2 parents af74c70 + 9bc848a commit dc90402

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+125
-198
lines changed

‎build/tests/mpsActions.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,15 @@
333333
<target name="test.actions" depends="assemble">
334334
<path location="${build.layout}/jetbrains.mps.lang.plugin.tests.jar" id="mps.tests.path" />
335335
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
336+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
336337
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
337338
<jvmargs>
338339
<arg value="-ea" />
339340
<arg value="-Xmx2048m" />
340341
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
341342
<arg value="-Didea.config.path=${build.mps.config.path}" />
342343
<arg value="-Didea.system.path=${build.mps.system.path}" />
343-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
344+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
344345
</jvmargs>
345346

346347

‎build/tests/mpsBaseLanguage.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1948,14 +1948,15 @@
19481948
<pathelement location="${build.layout}/collections_trove.test.jar" />
19491949
</path>
19501950
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
1951+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
19511952
<launchtests fork="true" haltonfailure="${mps.junit.haltonfailure}" mpshome="${artifacts.mps}" reports="${build.tmp}">
19521953
<jvmargs>
19531954
<arg value="-ea" />
19541955
<arg value="-Xmx2048m" />
19551956
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
19561957
<arg value="-Didea.config.path=${build.mps.config.path}" />
19571958
<arg value="-Didea.system.path=${build.mps.system.path}" />
1958-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
1959+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
19591960
</jvmargs>
19601961

19611962

‎build/tests/mpsBehavior.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1278,14 +1278,15 @@
12781278
<pathelement location="${build.layout}/behavior-tests/test.behavior.plugin/languages/reflectiveTest/TestBehaviorReflective.jar" />
12791279
</path>
12801280
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
1281+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
12811282
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
12821283
<jvmargs>
12831284
<arg value="-ea" />
12841285
<arg value="-Xmx2048m" />
12851286
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
12861287
<arg value="-Didea.config.path=${build.mps.config.path}" />
12871288
<arg value="-Didea.system.path=${build.mps.system.path}" />
1288-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
1289+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
12891290
</jvmargs>
12901291

12911292

‎build/tests/mpsBuild.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -478,14 +478,15 @@
478478
<pathelement location="${build.layout}/runner.test/jetbrains.mps.build.mps.runner.test.jar" />
479479
</path>
480480
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
481+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
481482
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
482483
<jvmargs>
483484
<arg value="-ea" />
484485
<arg value="-Xmx2048m" />
485486
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
486487
<arg value="-Didea.config.path=${build.mps.config.path}" />
487488
<arg value="-Didea.system.path=${build.mps.system.path}" />
488-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
489+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
489490
</jvmargs>
490491

491492

‎build/tests/mpsConsole.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -423,14 +423,15 @@
423423
<target name="test.console" depends="assemble">
424424
<path location="${build.layout}/tests/jetbrains.mps.console.tests.jar" id="mps.tests.path" />
425425
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
426+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
426427
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
427428
<jvmargs>
428429
<arg value="-ea" />
429430
<arg value="-Xmx2048m" />
430431
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
431432
<arg value="-Didea.config.path=${build.mps.config.path}" />
432433
<arg value="-Didea.system.path=${build.mps.system.path}" />
433-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
434+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
434435
</jvmargs>
435436

436437

‎build/tests/mpsConstraints.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -948,14 +948,15 @@
948948
<pathelement location="${build.layout}/solutions/TestRulesConstraints.jar" />
949949
</path>
950950
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
951+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
951952
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
952953
<jvmargs>
953954
<arg value="-ea" />
954955
<arg value="-Xmx2048m" />
955956
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
956957
<arg value="-Didea.config.path=${build.mps.config.path}" />
957958
<arg value="-Didea.system.path=${build.mps.system.path}" />
958-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
959+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
959960
</jvmargs>
960961

961962

‎build/tests/mpsDataFlow.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -757,14 +757,15 @@
757757
<target name="test.dataFlow" depends="assemble">
758758
<path location="${build.layout}/solutions/analyzers.test.jar" id="mps.tests.path" />
759759
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
760+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
760761
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
761762
<jvmargs>
762763
<arg value="-ea" />
763764
<arg value="-Xmx2048m" />
764765
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
765766
<arg value="-Didea.config.path=${build.mps.config.path}" />
766767
<arg value="-Didea.system.path=${build.mps.system.path}" />
767-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
768+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
768769
</jvmargs>
769770

770771

‎build/tests/mpsEditor.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3320,6 +3320,7 @@
33203320
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.editor.forms.tests.jar" />
33213321
</path>
33223322
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
3323+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
33233324
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mpsBootstrapCore}" reports="${build.tmp}">
33243325
<jvmargs>
33253326
<arg value="-ea" />
@@ -3328,7 +3329,7 @@
33283329
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
33293330
<arg value="-Didea.config.path=${build.mps.config.path}" />
33303331
<arg value="-Didea.system.path=${build.mps.system.path}" />
3331-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
3332+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
33323333
</jvmargs>
33333334

33343335

‎build/tests/mpsEditorDiagram.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -701,14 +701,15 @@
701701
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.editor.diagram.testLanguage.jar" />
702702
</path>
703703
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
704+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
704705
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
705706
<jvmargs>
706707
<arg value="-ea" />
707708
<arg value="-Xmx2048m" />
708709
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
709710
<arg value="-Didea.config.path=${build.mps.config.path}" />
710711
<arg value="-Didea.system.path=${build.mps.system.path}" />
711-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
712+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
712713
</jvmargs>
713714

714715

‎build/tests/mpsEditorImageGen.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -623,14 +623,15 @@
623623
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.editor.imageGen.tests.jar" />
624624
</path>
625625
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
626+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
626627
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
627628
<jvmargs>
628629
<arg value="-ea" />
629630
<arg value="-Xmx2048m" />
630631
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
631632
<arg value="-Didea.config.path=${build.mps.config.path}" />
632633
<arg value="-Didea.system.path=${build.mps.system.path}" />
633-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
634+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
634635
</jvmargs>
635636

636637

‎build/tests/mpsEditorTransformationMenu.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3166,14 +3166,15 @@
31663166
<pathelement location="${build.layout}/tests/jetbrains.mps.editor.contextActionsTool.tests.jar" />
31673167
</path>
31683168
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
3169+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
31693170
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
31703171
<jvmargs>
31713172
<arg value="-ea" />
31723173
<arg value="-Xmx2048m" />
31733174
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
31743175
<arg value="-Didea.config.path=${build.mps.config.path}" />
31753176
<arg value="-Didea.system.path=${build.mps.system.path}" />
3176-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
3177+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
31773178
</jvmargs>
31783179

31793180

‎build/tests/mpsExecution.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1008,14 +1008,15 @@
10081008
<pathelement location="${build.layout}/jetbrains.mps.debugger.java.runtime.tests.jar" />
10091009
</path>
10101010
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
1011+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
10111012
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
10121013
<jvmargs>
10131014
<arg value="-ea" />
10141015
<arg value="-Xmx2048m" />
10151016
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
10161017
<arg value="-Didea.config.path=${build.mps.config.path}" />
10171018
<arg value="-Didea.system.path=${build.mps.system.path}" />
1018-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
1019+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
10191020
</jvmargs>
10201021

10211022

‎build/tests/mpsFeedback.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -532,14 +532,15 @@
532532
<target name="test.feedback" depends="assemble">
533533
<path location="${build.layout}/solutions/messages.sandbox.jar" id="mps.tests.path" />
534534
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
535+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
535536
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
536537
<jvmargs>
537538
<arg value="-ea" />
538539
<arg value="-Xmx2048m" />
539540
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
540541
<arg value="-Didea.config.path=${build.mps.config.path}" />
541542
<arg value="-Didea.system.path=${build.mps.system.path}" />
542-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
543+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
543544
</jvmargs>
544545

545546

‎build/tests/mpsGenerator.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3084,14 +3084,15 @@
30843084
<pathelement location="${build.layout}/xmodel-tests/jetbrains.mps.generator.xmodel.build.test.jar" />
30853085
</path>
30863086
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
3087+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
30873088
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
30883089
<jvmargs>
30893090
<arg value="-ea" />
30903091
<arg value="-Xmx2048m" />
30913092
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
30923093
<arg value="-Didea.config.path=${build.mps.config.path}" />
30933094
<arg value="-Didea.system.path=${build.mps.system.path}" />
3094-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
3095+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
30953096
</jvmargs>
30963097

30973098

‎build/tests/mpsHttpSupport.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -412,14 +412,15 @@
412412
<target name="test.http-support" depends="assemble">
413413
<path location="${build.layout}/jetbrains.mps.ide.httpsupport.tests.jar" id="mps.tests.path" />
414414
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
415+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
415416
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
416417
<jvmargs>
417418
<arg value="-ea" />
418419
<arg value="-Xmx2048m" />
419420
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
420421
<arg value="-Didea.config.path=${build.mps.config.path}" />
421422
<arg value="-Didea.system.path=${build.mps.system.path}" />
422-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
423+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
423424
</jvmargs>
424425

425426

‎build/tests/mpsImplementationStripping.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -747,14 +747,15 @@
747747
<pathelement location="${build.layout}/tests/jetbrains.mps.samples.JavaKaja.jar" />
748748
</path>
749749
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
750+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
750751
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
751752
<jvmargs>
752753
<arg value="-ea" />
753754
<arg value="-Xmx2048m" />
754755
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
755756
<arg value="-Didea.config.path=${build.mps.config.path}" />
756757
<arg value="-Didea.system.path=${build.mps.system.path}" />
757-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
758+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
758759
</jvmargs>
759760

760761

‎build/tests/mpsJava.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -429,14 +429,15 @@
429429
<pathelement location="${build.layout}/jetbrains.mps.ide.java.testMaterial.jar" />
430430
</path>
431431
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
432+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
432433
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
433434
<jvmargs>
434435
<arg value="-ea" />
435436
<arg value="-Xmx2048m" />
436437
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
437438
<arg value="-Didea.config.path=${build.mps.config.path}" />
438439
<arg value="-Didea.system.path=${build.mps.system.path}" />
439-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
440+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
440441
</jvmargs>
441442

442443

‎build/tests/mpsKotlin.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -504,14 +504,15 @@
504504
<pathelement location="${build.layout}/jetbrains.mps.kotlin.tests.editor.jar" />
505505
</path>
506506
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
507+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
507508
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
508509
<jvmargs>
509510
<arg value="-ea" />
510511
<arg value="-Xmx2048m" />
511512
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
512513
<arg value="-Didea.config.path=${build.mps.config.path}" />
513514
<arg value="-Didea.system.path=${build.mps.system.path}" />
514-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
515+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
515516
</jvmargs>
516517

517518

‎build/tests/mpsPackaged.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -539,14 +539,15 @@
539539
<pathelement location="${build.layout}/testPackagedLanguage.test.jar" />
540540
</path>
541541
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
542+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
542543
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
543544
<jvmargs>
544545
<arg value="-ea" />
545546
<arg value="-Xmx2048m" />
546547
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
547548
<arg value="-Didea.config.path=${build.mps.config.path}" />
548549
<arg value="-Didea.system.path=${build.mps.system.path}" />
549-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
550+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
550551
</jvmargs>
551552

552553

‎build/tests/mpsSModel.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -904,14 +904,15 @@
904904
<pathelement location="${build.layout}/jetbrains.mps.lang.quotation.test.jar" />
905905
</path>
906906
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
907+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
907908
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
908909
<jvmargs>
909910
<arg value="-ea" />
910911
<arg value="-Xmx2048m" />
911912
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
912913
<arg value="-Didea.config.path=${build.mps.config.path}" />
913914
<arg value="-Didea.system.path=${build.mps.system.path}" />
914-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
915+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
915916
</jvmargs>
916917

917918

‎build/tests/mpsSmartRefAttrMigration_gen.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -332,14 +332,15 @@
332332
<target name="test.sraMigration" depends="assemble">
333333
<path location="${build.layout}/jetbrains.mps.tests.sraMigration.jar" id="mps.tests.path" />
334334
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
335+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
335336
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
336337
<jvmargs>
337338
<arg value="-ea" />
338339
<arg value="-Xmx2048m" />
339340
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
340341
<arg value="-Didea.config.path=${build.mps.config.path}" />
341342
<arg value="-Didea.system.path=${build.mps.system.path}" />
342-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
343+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
343344
</jvmargs>
344345

345346

‎build/tests/mpsTest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2309,14 +2309,15 @@
23092309
<pathelement location="${build.layout}/jetbrains.mps.transformation.test.inputModels.jar" />
23102310
</path>
23112311
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
2312+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
23122313
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
23132314
<jvmargs>
23142315
<arg value="-ea" />
23152316
<arg value="-Xmx2048m" />
23162317
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
23172318
<arg value="-Didea.config.path=${build.mps.config.path}" />
23182319
<arg value="-Didea.system.path=${build.mps.system.path}" />
2319-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
2320+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
23202321
</jvmargs>
23212322

23222323

‎build/tests/mpsTestModules.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1312,6 +1312,7 @@
13121312
<pathelement location="${build.layout}/tests/testModelRenaming.jar" />
13131313
</path>
13141314
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
1315+
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
13151316
<launchtests fork="true" haltonfailure="false" mpshome="${artifacts.mps}" reports="${build.tmp}">
13161317
<jvmargs>
13171318
<arg value="-ea" />
@@ -1320,7 +1321,7 @@
13201321
<arg value="-XX:+HeapDumpOnOutOfMemoryError" />
13211322
<arg value="-Didea.config.path=${build.mps.config.path}" />
13221323
<arg value="-Didea.system.path=${build.mps.system.path}" />
1323-
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
1324+
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
13241325
</jvmargs>
13251326

13261327

0 commit comments

Comments
 (0)