Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Truffle] Do not use the core load path for backtrace tests.
Browse files Browse the repository at this point in the history
eregon committed Sep 21, 2016
1 parent d355d74 commit a6e4a53
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion test/truffle/integration/backtraces.sh
Original file line number Diff line number Diff line change
@@ -7,5 +7,5 @@ set -e
for f in test/truffle/integration/backtraces/*.rb
do
echo $f
jt ruby $f
jt ruby --no-core-load-path $f
done
15 changes: 8 additions & 7 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -574,11 +574,7 @@ def rebuild
def run(*args)
env_vars = args.first.is_a?(Hash) ? args.shift : {}

jruby_args = [
'-X+T',
"-Xtruffle.core.load_path=#{JRUBY_DIR}/truffle/src/main/ruby",
'-Xtruffle.graal.warn_unless=false'
]
jruby_args = ['-X+T']

if ENV['JRUBY_OPTS'] && ENV['JRUBY_OPTS'].include?('-Xclassic')
jruby_args.delete '-X+T'
@@ -591,11 +587,16 @@ def run(*args)
args.unshift dep if args.include?(arg)
end

unless args.delete('--no-core-load-path')
jruby_args << "-Xtruffle.core.load_path=#{JRUBY_DIR}/truffle/src/main/ruby"
end

if args.delete('--graal')
javacmd, javacmd_options = Utilities.find_graal_javacmd_and_options
env_vars["JAVACMD"] = javacmd
jruby_args.push *javacmd_options
jruby_args.delete('-Xtruffle.graal.warn_unless=false')
jruby_args.push(*javacmd_options)
else
jruby_args << '-Xtruffle.graal.warn_unless=false'
end

if args.delete('--js')

0 comments on commit a6e4a53

Please sign in to comment.