Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 42c6e9306075
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be26a3a7a2a1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 8, 2016

  1. Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    e959056 View commit details
  2. [Truffle] We need to wait a bit when looking at stacks because we don…

    …'t know when they enter a part of the program we're looking for.
    chrisseaton committed Mar 8, 2016
    Copy the full SHA
    ca7c9d5 View commit details
  3. Copy the full SHA
    be26a3a View commit details
Showing with 5 additions and 1 deletion.
  1. +1 −1 spec/truffle/truffle.mspec
  2. +4 −0 test/truffle/integration/instrumentation-server.sh
2 changes: 1 addition & 1 deletion spec/truffle/truffle.mspec
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class MSpecScript
set :target, File.expand_path("../../../bin/jruby#{windows? ? '.bat' : ''}", __FILE__)

if ARGV[-2..-1] != %w[-t ruby] # No flags for MRI
set :flags, %w[-X+T -J-ea -J-esa -J-Xmx2G -Xtruffle.coverage=true]
set :flags, %w[-X+T -J-ea -J-esa -J-Xmx2G]
end

set :language, [
4 changes: 4 additions & 0 deletions test/truffle/integration/instrumentation-server.sh
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@ PORT=14873
ruby -X+T -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb &
pid=$!

sleep 6

while ! (curl -s http://localhost:$PORT/stacks > /dev/null);
do
echo -n .
@@ -26,6 +28,8 @@ wait $pid || true
ruby -X+T -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb < in.txt > out.txt &
pid=$!

sleep 6

while ! (curl -s http://localhost:$PORT/stacks > /dev/null);
do
echo -n .