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

Commits on Sep 30, 2016

  1. Copy the full SHA
    e437b3b View commit details
  2. [Truffle] Kill the actual servers and not the subshells.

    * This kills all direct child processes of the subshell created by "cmd &".
    eregon committed Sep 30, 2016
    Copy the full SHA
    c2a4956 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −1 test/truffle/common.sh.inc
  2. +0 −1 tool/jt.rb
2 changes: 1 addition & 1 deletion test/truffle/common.sh.inc
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ function test_server {
sleep 1
done
jobs -l
kill -9 $serverpid
pkill -P $serverpid
wait $serverpid || true
if [[ $response != *"Hello"* ]]
then
1 change: 0 additions & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -884,7 +884,6 @@ def check_test_port
exit 1
end
end
private :check_test_port

def test_integration(env={}, *args)
env_vars = env