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] Use a common shell file to define the jt function for shell…
Browse files Browse the repository at this point in the history
…-based tests.

* Do not modify PATH.
* Let jt do the proper logging, option setup, etc.
eregon committed Sep 21, 2016
1 parent 457ca02 commit 267b16b
Showing 26 changed files with 83 additions and 59 deletions.
Original file line number Diff line number Diff line change
@@ -18,3 +18,7 @@ function test_server {
exit 1
fi
}

function jt {
ruby tool/jt.rb "$@"
}
4 changes: 3 additions & 1 deletion test/truffle/compiler/attachments-optimise.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

# relies on value profiling
ruby -X+T -J-G:+TruffleCompilationExceptionsAreFatal -Xtruffle.basic_ops.inline=false test/truffle/compiler/attachments-optimise/attachments-optimise.rb
jt ruby --graal -J-G:+TruffleCompilationExceptionsAreFatal -Xtruffle.basic_ops.inline=false test/truffle/compiler/attachments-optimise/attachments-optimise.rb
4 changes: 3 additions & 1 deletion test/truffle/compiler/osr.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

ruby -X+T -J-G:+TruffleCompilationExceptionsAreFatal test/truffle/compiler/osr/osr.rb
source test/truffle/common.sh.inc

jt ruby --graal -J-G:+TruffleCompilationExceptionsAreFatal test/truffle/compiler/osr/osr.rb
4 changes: 3 additions & 1 deletion test/truffle/compiler/pe.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

ruby -X+T -J-G:+TruffleCompilationExceptionsAreThrown -Xtruffle.basic_ops.inline=false test/truffle/compiler/pe/pe.rb
source test/truffle/common.sh.inc

jt ruby --graal -J-G:+TruffleCompilationExceptionsAreThrown -Xtruffle.basic_ops.inline=false test/truffle/compiler/pe/pe.rb
4 changes: 3 additions & 1 deletion test/truffle/compiler/stf-optimises.sh_excluded
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

ruby -X+T -J-G:+TruffleCompilationExceptionsAreFatal test/truffle/compiler/stf-optimises/stf-optimises.rb
source test/truffle/common.sh.inc

jt ruby --graal -J-G:+TruffleCompilationExceptionsAreFatal test/truffle/compiler/stf-optimises/stf-optimises.rb
4 changes: 3 additions & 1 deletion test/truffle/compiler/tp-optimises.sh_excluded
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

ruby -X+T -J-G:+TruffleCompilationExceptionsAreFatal test/truffle/compiler/tp-optimises/tp-optimises.rb
source test/truffle/common.sh.inc

jt ruby --graal -J-G:+TruffleCompilationExceptionsAreFatal test/truffle/compiler/tp-optimises/tp-optimises.rb
2 changes: 1 addition & 1 deletion test/truffle/ecosystem/gem-testing.sh
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@

set -e

jruby+truffle --dir ../jruby-truffle-gem-test-pack/gem-testing ci --offline --batch test/truffle/ecosystem/batch.yaml
bin/jruby+truffle --dir ../jruby-truffle-gem-test-pack/gem-testing ci --offline --batch test/truffle/ecosystem/batch.yaml
4 changes: 3 additions & 1 deletion test/truffle/gems/asciidoctor.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

GEM_HOME=${GEM_HOME:-lib/ruby/gems/shared}

ruby -X+T $GEM_HOME/gems/asciidoctor-1.5.4/bin/asciidoctor --attribute last-update-label!= test/truffle/gems/asciidoctor/userguide.adoc
jt ruby $GEM_HOME/gems/asciidoctor-1.5.4/bin/asciidoctor --attribute last-update-label!= test/truffle/gems/asciidoctor/userguide.adoc

if ! cmp --silent test/truffle/gems/asciidoctor/userguide.html test/truffle/gems/asciidoctor/userguide-expected.html
then
8 changes: 5 additions & 3 deletions test/truffle/gems/execjs.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

GEM_HOME=${GEM_HOME:-lib/ruby/gems/shared}

ruby -X+T -I$GEM_HOME/gems/execjs-2.6.0/lib test/truffle/gems/execjs/checkruntime.rb
ruby -X+T -I$GEM_HOME/gems/execjs-2.6.0/lib test/truffle/gems/execjs/simple.rb
ruby -X+T -I$GEM_HOME/gems/execjs-2.6.0/lib test/truffle/gems/execjs/coffeescript.rb
jt ruby -I$GEM_HOME/gems/execjs-2.6.0/lib test/truffle/gems/execjs/checkruntime.rb
jt ruby -I$GEM_HOME/gems/execjs-2.6.0/lib test/truffle/gems/execjs/simple.rb
jt ruby -I$GEM_HOME/gems/execjs-2.6.0/lib test/truffle/gems/execjs/coffeescript.rb
2 changes: 2 additions & 0 deletions test/truffle/gems/install-gems.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e
set -x

6 changes: 3 additions & 3 deletions test/truffle/gems/rack-server.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

GEM_HOME=${GEM_HOME:-lib/ruby/gems/shared}

source test/truffle/common/test_server.sh.inc

ruby -X+T -I$GEM_HOME/gems/rack-1.6.1/lib test/truffle/gems/rack-server/rack-server.rb & test_server
jt ruby -I$GEM_HOME/gems/rack-1.6.1/lib test/truffle/gems/rack-server/rack-server.rb & test_server
14 changes: 7 additions & 7 deletions test/truffle/gems/sinatra-server.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

GEM_HOME=${GEM_HOME:-lib/ruby/gems/shared}

source test/truffle/common/test_server.sh.inc

ruby -X+T -I$GEM_HOME/gems/rack-1.6.1/lib \
-I$GEM_HOME/gems/tilt-2.0.1/lib \
-I$GEM_HOME/gems/rack-protection-1.5.3/lib \
-I$GEM_HOME/gems/sinatra-1.4.6/lib \
test/truffle/gems/sinatra-server/sinatra-server.rb & test_server
jt ruby -I$GEM_HOME/gems/rack-1.6.1/lib \
-I$GEM_HOME/gems/tilt-2.0.1/lib \
-I$GEM_HOME/gems/rack-protection-1.5.3/lib \
-I$GEM_HOME/gems/sinatra-1.4.6/lib \
test/truffle/gems/sinatra-server/sinatra-server.rb & test_server
4 changes: 3 additions & 1 deletion test/truffle/integration/backtraces.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

for f in test/truffle/integration/backtraces/*.rb
do
echo $f
ruby -X+T $f
jt ruby $f
done
4 changes: 3 additions & 1 deletion test/truffle/integration/coverage.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

ruby -X+T test/truffle/integration/coverage/test.rb
source test/truffle/common.sh.inc

jt ruby test/truffle/integration/coverage/test.rb
6 changes: 4 additions & 2 deletions test/truffle/integration/instrumentation-server.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e
set -x

@@ -8,7 +10,7 @@ SLEEP_LINE=4

# Test /stacks

ruby -X+T -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb &
jt ruby -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb &
pid=$!

while [ ! -e ready.txt ]; do
@@ -34,7 +36,7 @@ rm ready.txt
# Test /break

( echo backtrace ; echo 20000+1400 ; echo exit ) > in.txt
ruby -X+T -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb < in.txt > out.txt &
jt ruby -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb < in.txt > out.txt &
pid=$!

while [ ! -e ready.txt ]; do
4 changes: 3 additions & 1 deletion test/truffle/integration/irb.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

ruby -X+T -S irb < test/truffle/integration/irb/input.txt > temp.txt
jt ruby -S irb < test/truffle/integration/irb/input.txt > temp.txt

if ! cmp --silent temp.txt test/truffle/integration/irb/output.txt
then
4 changes: 3 additions & 1 deletion test/truffle/integration/java-platform.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

ruby -X+T -Xtruffle.platform.use_java=true -e 'puts 14'
source test/truffle/common.sh.inc

jt ruby -Xtruffle.platform.use_java=true -e 'puts 14'
6 changes: 4 additions & 2 deletions test/truffle/integration/js.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

ruby -X+T test/truffle/integration/js/eval.rb
ruby -X+T test/truffle/integration/js/inline-exported.rb
jt ruby test/truffle/integration/js/eval.rb
jt ruby test/truffle/integration/js/inline-exported.rb
4 changes: 3 additions & 1 deletion test/truffle/integration/pack-real-usage.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

ruby -X+T test/truffle/integration/pack-real-usage/pack-real-usage.rb
source test/truffle/common.sh.inc

jt ruby test/truffle/integration/pack-real-usage/pack-real-usage.rb
4 changes: 3 additions & 1 deletion test/truffle/integration/r.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

ruby -X+T test/truffle/integration/r/eval.rb
jt ruby test/truffle/integration/r/eval.rb
4 changes: 3 additions & 1 deletion test/truffle/integration/safe.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

function run {
ruby -X+T -Xtruffle.platform.safe=false "$@"
jt ruby -Xtruffle.platform.safe=false "$@"
}

function safe {
4 changes: 3 additions & 1 deletion test/truffle/integration/sl.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

ruby -X+T test/truffle/integration/sl/inline-exported.rb
jt ruby test/truffle/integration/sl/inline-exported.rb
5 changes: 3 additions & 2 deletions test/truffle/integration/tcp-server.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

source test/truffle/common/test_server.sh.inc
ruby -X+T test/truffle/integration/tcp-server/tcp-server.rb & test_server
jt ruby test/truffle/integration/tcp-server/tcp-server.rb & test_server
4 changes: 3 additions & 1 deletion test/truffle/integration/tracing.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

for f in test/truffle/integration/tracing/*.rb
do
echo $f
ruby -X+T $f
jt ruby $f
done
5 changes: 3 additions & 2 deletions test/truffle/integration/webrick-server.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bash

source test/truffle/common.sh.inc

set -e

source test/truffle/common/test_server.sh.inc
ruby -X+T test/truffle/integration/webrick-server/webrick-server.rb & test_server
jt ruby test/truffle/integration/webrick-server/webrick-server.rb & test_server
24 changes: 2 additions & 22 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -782,7 +782,6 @@ def test_mri(*args)

def test_compiler(*args)
jruby_opts = []
jruby_opts << '-Xtruffle.graal.warn_unless=false'

if ENV['GRAAL_JS_JAR']
jruby_opts << '-J-cp'
@@ -791,20 +790,10 @@ def test_compiler(*args)

jruby_opts << '-Xtruffle.exceptions.print_java=true'

no_java_cmd = args.delete('--no-java-cmd')

unless no_java_cmd
javacmd, javacmd_options = Utilities.find_graal_javacmd_and_options
jruby_opts.push *javacmd_options
end

env_vars = {}
env_vars["JAVACMD"] = javacmd unless no_java_cmd
env_vars["JRUBY_OPTS"] = jruby_opts.join(' ')
env_vars["PATH"] = "#{Utilities.find_jruby_bin_dir}:#{ENV["PATH"]}"
env = { "JRUBY_OPTS" => jruby_opts.join(' ') }

Dir["#{JRUBY_DIR}/test/truffle/compiler/*.sh"].each do |test_script|
sh env_vars, test_script
sh env, test_script
end
end
private :test_compiler
@@ -894,8 +883,6 @@ def test_integration(env={}, *args)
env_vars = env
jruby_opts = []

jruby_opts << '-Xtruffle.graal.warn_unless=false'

if ENV['GRAAL_JS_JAR']
jruby_opts << '-J-cp'
jruby_opts << Utilities.find_graal_js
@@ -908,7 +895,6 @@ def test_integration(env={}, *args)

env_vars["JRUBY_OPTS"] = jruby_opts.join(' ')

env_vars["PATH"] = "#{Utilities.find_jruby_bin_dir}:#{ENV["PATH"]}"
tests_path = "#{JRUBY_DIR}/test/truffle/integration"
single_test = !args.empty?
test_names = single_test ? '{' + args.join(',') + '}' : '*'
@@ -923,16 +909,13 @@ def test_gems(env={}, *args)
env_vars = env
jruby_opts = []

jruby_opts << '-Xtruffle.graal.warn_unless=false'

if ENV['GRAAL_JS_JAR']
jruby_opts << '-J-cp'
jruby_opts << Utilities.find_graal_js
end

env_vars["JRUBY_OPTS"] = jruby_opts.join(' ')

env_vars["PATH"] = "#{Utilities.find_jruby_bin_dir}:#{ENV["PATH"]}"
tests_path = "#{JRUBY_DIR}/test/truffle/gems"
single_test = !args.empty?
test_names = single_test ? '{' + args.join(',') + '}' : '*'
@@ -948,15 +931,12 @@ def test_ecosystem(env={}, *args)
env_vars = env
jruby_opts = []

jruby_opts << '-Xtruffle.graal.warn_unless=false'

env_vars["JRUBY_OPTS"] = jruby_opts.join(' ')

unless File.exist? "#{JRUBY_DIR}/../jruby-truffle-gem-test-pack/gem-testing"
raise 'missing ../jruby-truffle-gem-test-pack/gem-testing directory'
end

env_vars["PATH"] = "#{Utilities.find_jruby_bin_dir}:#{ENV["PATH"]}"
tests_path = "#{JRUBY_DIR}/test/truffle/ecosystem"
single_test = !args.empty?
test_names = single_test ? '{' + args.join(',') + '}' : '*'

0 comments on commit 267b16b

Please sign in to comment.