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

Commits on Apr 3, 2016

  1. Where we're testing the freeze magic comment, we shouldn't call .freeze.

    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    2b4c9c3 View commit details

  2. Where we're testing the freeze command line flag, we shouldn't call .… 

    …freeze.
    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    bb5f905 View commit details

  3. [Truffle] Add configuration for :command_line tags and tag those that… 

    … fail.
    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    8ab4664 View commit details

  4. [Truffle] Run :command_line specs on Travis.

    @chrisseaton
    chrisseaton committed Apr 3, 2016
    2
    Copy the full SHA
    246edd7 View commit details
Showing with 49 additions and 12 deletions.
  1. +1 −0 .travis.yml
  2. +2 −0 spec/ruby/command_line/dash_a_tags.txt
  3. +1 −0 spec/ruby/command_line/dash_e_tags.txt
  4. +4 −0 spec/ruby/command_line/dash_n_tags.txt
  5. +2 −0 spec/ruby/command_line/dash_p_tags.txt
  6. +8 −0 spec/ruby/command_line/dash_s_tags.txt
  7. +1 −0 spec/ruby/command_line/dash_upper_e_tags.txt
  8. +1 −0 spec/ruby/command_line/dash_upper_f_tags.txt
  9. +6 −0 spec/ruby/command_line/dash_upper_k_tags.txt
  10. +3 −0 spec/ruby/command_line/dash_upper_u_tags.txt
  11. +1 −0 spec/ruby/command_line/dash_x_tags.txt
  12. +1 −1 spec/ruby/command_line/fixtures/freeze_flag_across_files.rb
  13. +1 −1 spec/ruby/command_line/fixtures/freeze_flag_across_files_diff_enc.rb
  14. +1 −1 spec/ruby/command_line/fixtures/freeze_flag_one_literal.rb
  15. +1 −1 spec/ruby/command_line/fixtures/freeze_flag_required.rb
  16. BIN spec/ruby/command_line/fixtures/freeze_flag_required_diff_enc.rb
  17. +1 −1 spec/ruby/command_line/fixtures/freeze_flag_two_literals.rb
  18. +3 −0 spec/ruby/command_line/frozen_strings_tags.txt
  19. +1 −1 spec/ruby/language/fixtures/freeze_magic_comment_across_files.rb
  20. +1 −1 spec/ruby/language/fixtures/freeze_magic_comment_across_files_diff_enc.rb
  21. +1 −1 spec/ruby/language/fixtures/freeze_magic_comment_across_files_no_comment.rb
  22. +1 −1 spec/ruby/language/fixtures/freeze_magic_comment_one_literal.rb
  23. +1 −1 spec/ruby/language/fixtures/freeze_magic_comment_required.rb
  24. BIN spec/ruby/language/fixtures/freeze_magic_comment_required_diff_enc.rb
  25. +1 −1 spec/ruby/language/fixtures/freeze_magic_comment_required_no_comment.rb
  26. +1 −1 spec/ruby/language/fixtures/freeze_magic_comment_two_literals.rb
  27. +4 −0 spec/truffle/truffle.mspec
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ env:
- PHASE='-Prake -Dtask=spec:jruby'
- PHASE='-Prake -Dtask=spec:jrubyc'
- PHASE='-Prake -Dtask=spec:profiler'
- JT='test specs :command_line'
- JT='test specs :language'
- JT='test specs :core'
- JT='test specs :library'
2 changes: 2 additions & 0 deletions spec/ruby/command_line/dash_a_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fails:The -a command line option runs the code in loop conditional on Kernel.gets()
fails:The -a command line option sets $-a
1 change: 1 addition & 0 deletions spec/ruby/command_line/dash_e_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:The -e command line option joins multiple strings with newlines
4 changes: 4 additions & 0 deletions spec/ruby/command_line/dash_n_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
fails:The -n command line option runs the code in loop conditional on Kernel.gets()
fails:The -n command line option only evaluates BEGIN blocks once
fails:The -n command line option only evaluates END blocks once
fails:The -n command line option allows summing over a whole file
2 changes: 2 additions & 0 deletions spec/ruby/command_line/dash_p_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fails:The -p command line option runs the code in loop conditional on Kernel.gets() and prints $_
fails:The -p command line option sets $-p
8 changes: 8 additions & 0 deletions spec/ruby/command_line/dash_s_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fails:The -s command line option when using -- to stop parsing sets the value to true without an explicit value
fails:The -s command line option when using -- to stop parsing parses single letter args into globals
fails:The -s command line option when using -- to stop parsing parses long args into globals
fails:The -s command line option when using -- to stop parsing converts extra dashes into underscores
fails:The -s command line option when running a script sets the value to true without an explicit value
fails:The -s command line option when running a script parses single letter args into globals
fails:The -s command line option when running a script parses long args into globals
fails:The -s command line option when running a script converts extra dashes into underscores
1 change: 1 addition & 0 deletions spec/ruby/command_line/dash_upper_e_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:ruby -E raises a RuntimeError if used with -U
1 change: 1 addition & 0 deletions spec/ruby/command_line/dash_upper_f_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:the -F command line option specifies the field separator pattern for -a
6 changes: 6 additions & 0 deletions spec/ruby/command_line/dash_upper_k_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
fails:The -K command line option sets __ENCODING__ to Encoding::ASCII_8BIT with -Ka
fails:The -K command line option sets __ENCODING__ to Encoding::ASCII_8BIT with -KA
fails:The -K command line option sets __ENCODING__ to Encoding::EUC_JP with -Ke
fails:The -K command line option sets __ENCODING__ to Encoding::EUC_JP with -KE
fails:The -K command line option sets __ENCODING__ to Encoding::Windows_31J with -Ks
fails:The -K command line option sets __ENCODING__ to Encoding::Windows_31J with -KS
3 changes: 3 additions & 0 deletions spec/ruby/command_line/dash_upper_u_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fails:ruby -U does not affect the source encoding
fails:ruby -U raises a RuntimeError if used with -Eext:int
fails:ruby -U raises a RuntimeError if used with -E:int
1 change: 1 addition & 0 deletions spec/ruby/command_line/dash_x_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:The -x command line option runs code after the first /#!.*ruby.*/-ish line in target file
2 changes: 1 addition & 1 deletion spec/ruby/command_line/fixtures/freeze_flag_across_files.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require_relative 'freeze_flag_required'

p "abc".freeze.object_id == $second_literal_id
p "abc".object_id == $second_literal_id
2 changes: 1 addition & 1 deletion spec/ruby/command_line/fixtures/freeze_flag_across_files_diff_enc.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require_relative 'freeze_flag_required_diff_enc'

p "abc".freeze.object_id != $second_literal_id
p "abc".object_id != $second_literal_id
2 changes: 1 addition & 1 deletion spec/ruby/command_line/fixtures/freeze_flag_one_literal.rb
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ids = Array.new(2) { "abc".freeze.object_id }
ids = Array.new(2) { "abc".object_id }
p ids.first == ids.last
2 changes: 1 addition & 1 deletion spec/ruby/command_line/fixtures/freeze_flag_required.rb
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$second_literal_id = "abc".freeze.object_id
$second_literal_id = "abc".object_id
Binary file modified spec/ruby/command_line/fixtures/freeze_flag_required_diff_enc.rb
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion spec/ruby/command_line/fixtures/freeze_flag_two_literals.rb
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
p "abc".freeze.object_id == "abc".freeze.object_id
p "abc".object_id == "abc".object_id
3 changes: 3 additions & 0 deletions spec/ruby/command_line/frozen_strings_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fails:The --enable-frozen-string-literal flag causes string literals to produce the same object each time
fails:The --enable-frozen-string-literal flag causes string literals to produce the same object for literals with the same content
fails:The --enable-frozen-string-literal flag causes string literals to produce the same object for literals with the same content in different files
2 changes: 1 addition & 1 deletion spec/ruby/language/fixtures/freeze_magic_comment_across_files.rb
View file
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@

require_relative 'freeze_magic_comment_required'

p "abc".freeze.object_id == $second_literal_id
p "abc".object_id == $second_literal_id
2 changes: 1 addition & 1 deletion spec/ruby/language/fixtures/freeze_magic_comment_across_files_diff_enc.rb
View file
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@

require_relative 'freeze_magic_comment_required_diff_enc'

p "abc".freeze.object_id != $second_literal_id
p "abc".object_id != $second_literal_id
2 changes: 1 addition & 1 deletion spec/ruby/language/fixtures/freeze_magic_comment_across_files_no_comment.rb
View file
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@

require_relative 'freeze_magic_comment_required_no_comment'

p "abc".freeze.object_id != $second_literal_id
p "abc".object_id != $second_literal_id
2 changes: 1 addition & 1 deletion spec/ruby/language/fixtures/freeze_magic_comment_one_literal.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true

ids = Array.new(2) { "abc".freeze.object_id }
ids = Array.new(2) { "abc".object_id }
p ids.first == ids.last
2 changes: 1 addition & 1 deletion spec/ruby/language/fixtures/freeze_magic_comment_required.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# frozen_string_literal: true

$second_literal_id = "abc".freeze.object_id
$second_literal_id = "abc".object_id
Binary file modified spec/ruby/language/fixtures/freeze_magic_comment_required_diff_enc.rb
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion spec/ruby/language/fixtures/freeze_magic_comment_required_no_comment.rb
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$second_literal_id = "abc".freeze.object_id
$second_literal_id = "abc".object_id
2 changes: 1 addition & 1 deletion spec/ruby/language/fixtures/freeze_magic_comment_two_literals.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# frozen_string_literal: true

p "abc".freeze.object_id == "abc".freeze.object_id
p "abc".object_id == "abc".object_id
4 changes: 4 additions & 0 deletions spec/truffle/truffle.mspec
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,10 @@ class MSpecScript
set :flags, %w[-X+T -J-ea -J-esa -J-Xmx2G -Xtruffle.coverage=true]
end

set :command_line, [
"spec/ruby/command_line"
]

set :language, [
"spec/ruby/language"
]