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

blooprifle: add -XX:+IgnoreUnrecognizedVMOptions to hardCodedDefaultJavaOpts #1845

Merged
merged 1 commit into from
Feb 14, 2023
Merged

blooprifle: add -XX:+IgnoreUnrecognizedVMOptions to hardCodedDefaultJavaOpts #1845

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
1 change: 1 addition & 0 deletions modules/bloop-rifle/src/main/scala/scala/build/blooprifle/BloopRifleConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ object BloopRifleConfig {
"-XX:+UseZGC", // ZGC returns unused memory back to the OS, so Bloop does not occupy so much memory if unused
"-XX:ZUncommitDelay=30",
"-XX:ZCollectionInterval=5",
"-XX:+IgnoreUnrecognizedVMOptions", // Do not fail if an non-standard (-X, -XX) VM option is not recognized.
"-Dbloop.ignore-sig-int=true"
)

Expand Down
14 changes: 0 additions & 14 deletions modules/integration/src/test/scala/scala/cli/integration/BloopTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,6 @@ class BloopTests extends ScalaCliSuite {
testScalaTermination(Constants.bloopVersion, shouldRestart = false)
}

test("invalid bloop options passed via cli cause bloop start failure") {
TestInputs.empty.fromRoot { root =>
runScalaCli("bloop", "exit").call(cwd = root)
val res = runScalaCli("bloop", "start", "--bloop-java-opt", "-zzefhjzl").call(
cwd = root,
stderr = os.Pipe,
check = false,
mergeErrIntoOut = true
)
expect(res.exitCode == 1)
expect(res.out.text().contains("Server failed with exit code 1"))
}
}

test("invalid bloop options passed via global bloop config json file cause bloop start failure") {
val inputs = TestInputs(
os.rel / "bloop.json" ->
Expand Down