Skip to content

Commit 67eade3

Browse files
Merge pull request #1151 from IETS3/refactor/improve-local-tests
build: improve local tests
2 parents 3181991 + f7f40e4 commit 67eade3

File tree

2 files changed

+4
-4
lines changed
  • code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRe
116116

117117
// 'artifacts' is used in the generated ant scripts as build output directory
118118
ext.artifactsDir = new File(buildDir, 'artifacts')
119-
ext.incrementalBuild = !project.hasProperty("disableIncrementalBuild")
120119

121120

122121
wrapper {
@@ -197,8 +196,8 @@ task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageL
197196
def defaultScriptArgs = [
198197
'mps.home' : resolveMps.destinationDir,
199198
'iets3.github.opensource.home' : rootDir,
199+
'build.jna.library.path' : new File(resolveMps.destinationDir, "lib/jna/${System.getProperty('os.arch')}"),
200200
'build.dir' : buildDir,
201-
'mps.generator.skipUnmodifiedModels': incrementalBuild,
202201
'version' : version
203202
]
204203
if (gradle.startParameter.logLevel.toString() != "LIFECYCLE") {
@@ -232,7 +231,7 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
232231
classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
233232
classpath: configurations.junitAnt.asPath)
234233
ant.junitreport {
235-
fileset(dir: "$buildDir", includes: '**/TEST*.xml')
234+
fileset(dir: "$buildDir", includes: '**/TEST*.xml', excludes: 'tmp/**')
236235
report(format: 'frames', todir: "$buildDir/junitreport")
237236
}
238237
ant.echo("JUnit report placed into $buildDir/junitreport/index.html")
@@ -521,4 +520,4 @@ cyclonedxBom {
521520

522521
assemble {
523522
dependsOn('cyclonedxBom')
524-
}
523+
}

code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13207,6 +13207,7 @@
1320713207
<node concept="2_Ic$z" id="mfGoedf1p2" role="3989C9">
1320813208
<property role="TZNOO" value="1.8" />
1320913209
<property role="2_Ic$B" value="true" />
13210+
<property role="2_Ic$$" value="true" />
1321013211
</node>
1321113212
<node concept="398rNT" id="1Y5vs7yKdR8" role="1l3spd">
1321213213
<property role="TrG5h" value="iets3.github.opensource.home" />

0 commit comments

Comments
 (0)