Skip to content

unit test bootstrap no securitymanager #9284

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

Open
ebarboni wants to merge 1 commit into
base: master
Choose a base branch
from
+1,250 −1,207
Open

unit test bootstrap no securitymanager #9284

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
6 changes: 2 additions & 4 deletions nbbuild/antsrc/org/netbeans/nbbuild/CheckLicense.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,9 @@ public Convert createConvert() {
while ((line = br.readLine ()) != null) {
if (line.indexOf (fragment) != -1) {
// Found it.
if (fail != null && "whenpresent".equals(fail.getValue())) {
if (failMsg != null) {
log(failMsg, Project.MSG_ERR);
}
if (fail != null && "whenpresent".equals(fail.getValue())) {
failMsg = "License found in " + f;
log(failMsg, Project.MSG_ERR);
}
Comment on lines +105 to 108
Copy link
Contributor Author

@ebarboni ebarboni Mar 19, 2026

Choose a reason for hiding this comment

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

construct failMsg anyway, and log it

break;
}
Expand Down
4 changes: 4 additions & 0 deletions nbbuild/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ test.dist.dir=build/testdist
test.user.dir=testuserdir
nb.run.validation=true
build.compiler.debug=on

bootstrap.jdk.release=11
# Options to pass to NetBeans when starting it with "ant tryme":
tryme.arg.hack=-J-Dnetbeans.full.hack=true

Expand Down Expand Up @@ -55,8 +57,10 @@ stop.when.clean.error=true

test.unit.cp=\
../platform/libs.junit4/external/junit-4.13.2.jar:\
../platform/libs.junit4/external/hamcrest-core-1.3.jar:\
netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\
netbeans/harness/modules/org-netbeans-insane.jar:\
${ant.home}/lib/ant-testutil.jar:\
${ant.home}/lib/ant-junit.jar:\
${ant.home}/lib/ant-junit4.jar:\
${ant.home}/lib/ant-launcher.jar:\
Expand Down
8 changes: 4 additions & 4 deletions nbbuild/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<property name="build.ant.classes.dir" location="${nb.build.dir}/antclasses"/>
<mkdir dir="${build.ant.classes.dir}"/>
<javac srcdir="antsrc" destdir="${build.ant.classes.dir}" deprecation="true" debug="${build.compiler.debug}" source="1.8" target="1.8">
<javac srcdir="antsrc" destdir="${build.ant.classes.dir}" deprecation="true" debug="${build.compiler.debug}" release="${bootstrap.jdk.release}">
<classpath>
<pathelement location="${ant.core.lib}"/>
</classpath>
Expand Down Expand Up @@ -99,7 +99,7 @@
<include name="nbbuild/external/jsoup*.jar"/>
</fileset>
</path>
<javac srcdir="antsrc" destdir="${build.ant.classes.dir}" deprecation="true" debug="${build.compiler.debug}" source="1.8" target="1.8">
<javac srcdir="antsrc" destdir="${build.ant.classes.dir}" deprecation="true" debug="${build.compiler.debug}" release="${bootstrap.jdk.release}">
<classpath refid="bootstrap-cp"/>
<compilerarg line="-Xlint -Xlint:-serial"/>
</javac>
Expand Down Expand Up @@ -1366,9 +1366,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<element name="test" implicit="true"/>
<sequential>
<mkdir dir="${nb.build.dir}/test/unit/classes"/>
<javac srcdir="test/unit/src" destdir="${nb.build.dir}/test/unit/classes" debug="true" source="1.8">
<javac srcdir="test/unit/src" destdir="${nb.build.dir}/test/unit/classes" debug="true" release="${bootstrap.jdk.release}">
<classpath path="${test.unit.cp}"/>
<compilerarg line="-Xlint -Xlint:-serial"/>
<compilerarg line="-Xlint -Xlint:-serial -proc:full"/>
</javac>
<copy todir="${nb.build.dir}/test/unit/classes">
<fileset dir="test/unit/src" excludes="**/*.java"/>
Expand Down
Loading
Loading