Skip to content
Snippets Groups Projects
Commit 0431e9e6 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

uniform way of providing java-17 options to surefire

parent b8e16803
No related branches found
No related tags found
2 merge requests!1700Resolve "introduce new frontend to the jar file build process",!1506simplify Java 17 compliance
Pipeline #57661 passed
...@@ -56,7 +56,6 @@ test:frontend: ...@@ -56,7 +56,6 @@ test:frontend:
coverage: '/(\d+.\d+) \% covered/' coverage: '/(\d+.\d+) \% covered/'
before_script: before_script:
# java.desktop module does not export Sun Graphics implementation for mockito # java.desktop module does not export Sun Graphics implementation for mockito
- export MAVEN_ARGS=-DsurefireArgLine=--add-opens=java.desktop/sun.java2d=ALL-UNNAMED
- apt-get update - apt-get update
- DEBIAN_FRONTEND=noninteractive apt-get install -y libxrender1 libxtst6 fontconfig libfreetype6 - DEBIAN_FRONTEND=noninteractive apt-get install -y libxrender1 libxtst6 fontconfig libfreetype6
- mvn dependency:purge-local-repository -DmanualInclude="lcsb.mapviewer" - mvn dependency:purge-local-repository -DmanualInclude="lcsb.mapviewer"
...@@ -80,7 +79,7 @@ test:frontend: ...@@ -80,7 +79,7 @@ test:frontend:
- export DISPLAY=:99 - export DISPLAY=:99
- mvn -DskipTests=true clean install -pl commons -am - mvn -DskipTests=true clean install -pl commons -am
- mvn test -pl commons $MAVEN_ARGS - mvn test -pl commons
- awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' commons/target/site/jacoco/jacoco.csv - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' commons/target/site/jacoco/jacoco.csv
.test_backend_annotation_template: .test_backend_annotation_template:
...@@ -111,7 +110,7 @@ test:frontend: ...@@ -111,7 +110,7 @@ test:frontend:
.test_backend_converter_graphics_template: .test_backend_converter_graphics_template:
script: &test_backend_converter_graphics_definition script: &test_backend_converter_graphics_definition
- mvn -DskipTests=true clean install -pl converter-graphics -am - mvn -DskipTests=true clean install -pl converter-graphics -am
- mvn test -pl converter-graphics $MAVEN_ARGS - mvn test -pl converter-graphics
- awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' converter-graphics/target/site/jacoco/jacoco.csv - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' converter-graphics/target/site/jacoco/jacoco.csv
.test_backend_converter_CellDesigner_template: .test_backend_converter_CellDesigner_template:
......
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
<configuration> <configuration>
<useSystemClassLoader>false</useSystemClassLoader> <useSystemClassLoader>false</useSystemClassLoader>
<surefire.rerunFailingTestsCount>4</surefire.rerunFailingTestsCount> <surefire.rerunFailingTestsCount>4</surefire.rerunFailingTestsCount>
<argLine>@{argLine} ${surefireArgLine}</argLine> <argLine>@{argLine} ${surefireArgLine} --add-opens=java.desktop/sun.java2d=ALL-UNNAMED -XX:+IgnoreUnrecognizedVMOptions</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment