Skip to content

Commit

Permalink
[Truffle] --no-java-cmd in test compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisseaton
chrisseaton committed Jan 21, 2016
1 parent 7544128 commit 7a20145
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -373,7 +373,7 @@ def test_mri(*args)

def test_compiler(*args)
env_vars = {}
env_vars["JAVACMD"] = Utilities.find_graal
env_vars["JAVACMD"] = Utilities.find_graal unless args.delete('--no-java-cmd')
Dir["#{JRUBY_DIR}/test/truffle/compiler/*.sh"].each do |test_script|
sh env_vars, test_script
end

3 comments on commit 7a20145

@eregon
Copy link
Member

@eregon eregon commented on 7a20145 Jan 21, 2016

Choose a reason for hiding this comment

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

Maybe just

env_vars["JAVACMD"] = ENV["JAVACMD"] || Utilities.find_graal

?

@chrisseaton
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think this does the same thing does it? I want an operation that normally sets JAVACMD to not do that if --no-java-cmd is specified. Your code always sets JAVACMD.

This is for the GraalVM where bin/ruby doesn't need JAVACMD to use Graal.

@eregon
Copy link
Member

@eregon eregon commented on 7a20145 Jan 22, 2016

Choose a reason for hiding this comment

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

ah, fair enough, that sounds good then.

Please sign in to comment.