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: 29e3e5823625
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 49858e991d17
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 20, 2016

  1. Copy the full SHA
    908c5f1 View commit details
  2. Copy the full SHA
    49858e9 View commit details
Showing with 4 additions and 3 deletions.
  1. +2 −2 test/truffle/integration/instrumentation-server.sh
  2. +2 −1 test/truffle/integration/instrumentation-server/subject.rb
4 changes: 2 additions & 2 deletions test/truffle/integration/instrumentation-server.sh
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ 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
sleep 9

while ! (curl -s http://localhost:$PORT/stacks > /dev/null);
do
@@ -38,7 +38,7 @@ done

curl -s http://localhost:$PORT/break

sleep 1
sleep 3
kill -9 $pid || true
wait $pid || true

3 changes: 2 additions & 1 deletion test/truffle/integration/instrumentation-server/subject.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
loop do
end
sleep 0.5
end