Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move java modules job to JDK 11 and fix tests where needed #5138

Merged
merged 1 commit into from
Jan 10, 2023
Merged

move java modules job to JDK 11 and fix tests where needed #5138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 3 additions & 33 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,21 +1207,15 @@ jobs:


java-modules-test:
name: Java Modules on Linux/JDK ${{ matrix.java }} (some on 11)
name: Java Modules on Linux/JDK ${{ matrix.java }}
needs: base-build
runs-on: ubuntu-latest
timeout-minutes: 100
strategy:
matrix:
java: [ '8' ]
java: [ '11' ]
steps:

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 11
distribution: ${{ env.default_java_distribution }}

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -1391,36 +1385,12 @@ jobs:
- name: xml.jaxb
run: ant $OPTS -f java/xml.jaxb test

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 11
distribution: ${{ env.default_java_distribution }}

- name: Set up opts
run: echo "OPTS_11=-Dtest.run.args=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming -Dtest.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true" >> $GITHUB_ENV

- name: java.lexer
run: ant $OPTS -f java/java.lexer test

- name: java.completion
if: env.test_java == 'true' && success()
run: ant $OPTS $OPTS_11 -f java/java.completion test

- name: java.editor
if: env.test_java == 'true' && success()
run: .github/retry.sh ant $OPTs $OPTS_11 -f java/java.editor test-unit

- name: java.source
run: ant $OPTS $OPTS_11 -f java/java.source test-unit

- name: java.source.base
if: env.test_java == 'true' && success()
run: .github/retry.sh ant $OPTS $OPTS_11 -f java/java.source.base test

- name: refactoring.java
if: env.test_java == 'true' && success()
run: ant $OPTS $OPTS_11 -f java/refactoring.java test-unit
run: ant $OPTS -f java/refactoring.java test-unit

- name: form
if: env.test_java == 'true' && success()
Expand Down
44 changes: 0 additions & 44 deletions java/classfile/test/unit/src/org/netbeans/modules/classfile/ConstantPoolTest.java
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion java/classfile/test/unit/src/org/netbeans/modules/classfile/ModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,13 @@ private static Path getModulesRoot() {
if (provider == null) {
return null;
}

// JDK 9-12 returns /
// JDK 13+ returns /modules as root
final Path jimageRoot = provider.getPath(URI.create("jrt:///")); //NOI18N
return jimageRoot;

final Path modules = jimageRoot.resolve("modules");
return Files.exists(modules) ? modules : jimageRoot;
} catch (IOException ioe) {
LOG.log(Level.WARNING, "Cannot load jrt nio provider.", ioe); //NOI18N
return null;
Expand Down
5 changes: 5 additions & 0 deletions java/java.completion/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@ test.timeout=1200000

# requires nb.javac for compiling of tests on Mac
requires.nb.javac=true

# remove default compiler JMS flags so that we don't get "Unknown module" warnings due to --limit-modules
jms-compiler.flags.jvm=
test.jms.flags=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming
test.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true
Comment on lines +37 to +38
Copy link
Member Author

@mbien mbien Dec 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this has almost the same effect as the old CI config line:

OPTS_11=-Dtest.run.args=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming -Dtest.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true

the difference is that the entire run args property isn't overwritten which is set up here:

netbeans/nbbuild/templates/projectized.xml

Line 293 in 30a8cef

<property name="test.run.args" value="-ea -Xms1200m -Xmx1200m -XX:+UseParallelGC ${metabuild.jms-flags.jvm} ${test.jms.flags} -XX:+IgnoreUnrecognizedVMOptions"/>

this has however the side effect of warnings like:
WARNING: Unknown module: jdk.compiler specified to --add-exports

Copy link
Member Author

@mbien mbien Dec 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually, i got an idea while waiting for Santa.

we can simply unset the default flags of the compiler category:

# remove default compiler JMS flags so that we don't get "Unknown module" warnings due to --limit-modules
jms-compiler.flags.jvm=

since we split them into categories already (#3658) we may as well make use of that fact :)

5 changes: 5 additions & 0 deletions java/java.editor/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,8 @@ test.timeout=1200000

# requires nb.javac for compiling of tests on Mac
requires.nb.javac=true

# remove default compiler JMS flags so that we don't get "Unknown module" warnings due to --limit-modules
jms-compiler.flags.jvm=
test.jms.flags=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming
test.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true
4 changes: 4 additions & 0 deletions java/java.source.base/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,7 @@ test.config.vanilla-javac.excludes=\
**/gen/TreeManipulationTest.class,\
**/parsing/JavacParserTest.class

# remove default compiler JMS flags so that we don't get "Unknown module" warnings due to --limit-modules
jms-compiler.flags.jvm=
test.jms.flags=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming
test.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true
5 changes: 5 additions & 0 deletions java/java.source/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,8 @@ test.timeout=3600000
test.config.jet-main.includes=\
org/netbeans/modules/java/JavaNodeTest.class,\
**/UiUtilsTest.class

# remove default compiler JMS flags so that we don't get "Unknown module" warnings due to --limit-modules
jms-compiler.flags.jvm=
test.jms.flags=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming
test.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true
5 changes: 5 additions & 0 deletions java/refactoring.java/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,8 @@ test.config.stableBTD.excludes=org/netbeans/modules/test/*

requires.nb.javac=true
test.unit.cp.extra=../java.source.nbjavac/build/test-nb-javac/cluster/modules/org-netbeans-modules-java-source-nbjavac-test.jar

# remove default compiler JMS flags so that we don't get "Unknown module" warnings due to --limit-modules
jms-compiler.flags.jvm=
test.jms.flags=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming
test.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true
3 changes: 3 additions & 0 deletions java/whitelist/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ javadoc.apichanges=${basedir}/apichanges.xml
requires.nb.javac=true

test.config.stableBTD.includes=**/*Test.class

# for JDK 11+
test.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true