Skip to content

Commit

Permalink
Merge pull request #1151 from IETS3/refactor/improve-local-tests
Browse files Browse the repository at this point in the history
build: improve local tests
  • Loading branch information
sergej-koscejev authored Dec 3, 2024
2 parents 3181991 + f7f40e4 commit 67eade3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRe

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


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

assemble {
dependsOn('cyclonedxBom')
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13207,6 +13207,7 @@
<node concept="2_Ic$z" id="mfGoedf1p2" role="3989C9">
<property role="TZNOO" value="1.8" />
<property role="2_Ic$B" value="true" />
<property role="2_Ic$$" value="true" />
</node>
<node concept="398rNT" id="1Y5vs7yKdR8" role="1l3spd">
<property role="TrG5h" value="iets3.github.opensource.home" />
Expand Down

0 comments on commit 67eade3

Please sign in to comment.