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

Commits on Feb 9, 2016

  1. Copy the full SHA
    a0db1d2 View commit details
  2. Copy the full SHA
    0fbef23 View commit details
  3. Copy the full SHA
    a46ad9a View commit details
  4. Copy the full SHA
    3a193b8 View commit details
7 changes: 2 additions & 5 deletions test/truffle/integration/rack-server/rack-server.rb
Original file line number Diff line number Diff line change
@@ -7,16 +7,13 @@
# GNU Lesser General Public License version 2.1

require 'rack'

# bin/jruby bin/gem install rack
# jt run -Ilib/ruby/gems/shared/gems/rack-1.6.1/lib simple-rack-server.rb


class Example
def call(env)
return [200, {}, ["Hello Rack!\n"]]
end
end

Rack::Handler::WEBrick.run(
Example.new,
:Port => 8080
3 changes: 0 additions & 3 deletions test/truffle/integration/sinatra-server/sinatra-server.rb
Original file line number Diff line number Diff line change
@@ -8,9 +8,6 @@

require 'sinatra'

# bin/jruby bin/gem install sinatra
# jt run -Ilib/ruby/gems/shared/gems/rack-1.6.1/lib -Ilib/ruby/gems/shared/gems/tilt-2.0.1/lib -Ilib/ruby/gems/shared/gems/rack-protection-1.5.3/lib -Ilib/ruby/gems/shared/gems/sinatra-1.4.6/lib test/truffle/simple-sinatra-server.rb

set :port, 8080

get '/' do
17 changes: 0 additions & 17 deletions test/truffle/metrics/client.rb

This file was deleted.

2 changes: 1 addition & 1 deletion test/truffle/metrics/codeload.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
10_000.times do |n|
5_000.times do |n|
eval %{
def foo#{n}(a, b, c)
if a == b
27 changes: 0 additions & 27 deletions test/truffle/metrics/count-classes.rb

This file was deleted.

14 changes: 0 additions & 14 deletions test/truffle/metrics/jruby-timed

This file was deleted.

67 changes: 0 additions & 67 deletions test/truffle/metrics/minimum-heap.rb

This file was deleted.

21 changes: 0 additions & 21 deletions test/truffle/metrics/one-request.rb

This file was deleted.

55 changes: 0 additions & 55 deletions test/truffle/metrics/process-times.rb

This file was deleted.

35 changes: 0 additions & 35 deletions test/truffle/metrics/total-allocation.rb

This file was deleted.

7 changes: 0 additions & 7 deletions test/truffle/metrics/with-client.sh

This file was deleted.

Original file line number Diff line number Diff line change
@@ -207,7 +207,7 @@
* {@link Layout} annotations are processed by {@link OMProcessor}.
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.CLASS)
@Retention(RetentionPolicy.SOURCE)
public @interface Layout {

String objectTypeSuperclass() default "ObjectType";
Original file line number Diff line number Diff line change
@@ -18,6 +18,6 @@
* @see Layout
*/
@Target(ElementType.PARAMETER)
@Retention(RetentionPolicy.CLASS)
@Retention(RetentionPolicy.SOURCE)
public @interface Nullable {
}
Original file line number Diff line number Diff line change
@@ -18,6 +18,6 @@
* @see Layout
*/
@Target(ElementType.PARAMETER)
@Retention(RetentionPolicy.CLASS)
@Retention(RetentionPolicy.SOURCE)
public @interface Volatile {
}