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

Commits on Jan 14, 2015

  1. [Truffle] JT: only show help if it is the first argument 

    * So we can use --help for a mspec command for instance.
    @eregon
    eregon committed Jan 14, 2015
    Copy the full SHA
    5b2927c View commit details

  2. [Truffle] Allow the simple read mode for opening files.

    @eregon
    eregon committed Jan 14, 2015
    Copy the full SHA
    a1acb23 View commit details

  3. [Truffle] Tag "slow" language specs which spawn sub-processes. 

    * Manually since there are not so many in language specs.
* Run with $ jt test :language --excl-tag slow
  Before: 43s (47s total)
  After:   4s ( 8s total)
    @eregon
    eregon committed Jan 14, 2015
    6
    Copy the full SHA
    ada9e8e View commit details
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/truffle/runtime/core/RubyFile.java
View file
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ public static RubyFile open(RubyContext context, String fileName, String mode) {
Reader reader;
Writer writer;

if (mode.equals("rb")) {
if (mode.equals("r") || mode.equals("rb")) {
try {
reader = new InputStreamReader(new FileInputStream(fileName), StandardCharsets.UTF_8);
} catch (FileNotFoundException e) {
5 changes: 4 additions & 1 deletion spec/truffle/tags/language/break_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -3,4 +3,7 @@ fails:The break statement in a captured block when the invocation of the scope c
fails:The break statement in a captured block when the invocation of the scope creating the block is still active raises a LocalJumpError when yielding to the block
fails:The break statement in a captured block from a scope that has returned raises a LocalJumpError when calling the block from a method
fails:The break statement in a captured block from a scope that has returned raises a LocalJumpError when yielding to the block
fails:Executing break from within a block returns from the original invoking method even in case of chained calls
fails:Executing break from within a block returns from the original invoking method even in case of chained calls
slow:The break statement in a lambda created at the toplevel returns a value when invoking from a method
slow:The break statement in a lambda created at the toplevel returns a value when invoking from a block
slow:The break statement in a lambda created at the toplevel returns a value when invoking from the toplevel
5 changes: 5 additions & 0 deletions spec/truffle/tags/language/predefined/data_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
fails(inherited):The DATA constant succeeds in locking the file DATA came from
slow:The DATA constant exists when the main script contains __END__
slow:The DATA constant does not exist when the main script contains no __END__
slow:The DATA constant does not exist when an included file has a __END__
slow:The DATA constant does not change when an included files also has a __END__
slow:The DATA constant is included in an otherwise empty file
5 changes: 5 additions & 0 deletions spec/truffle/tags/language/predefined_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
fails:The predefined global constant ARGV contains Strings encoded in locale Encoding
slow:Execution variable $: does not include '.' when the taint check level > 1
slow:The predefined global constant STDERR has the encodings set by #set_encoding
slow:The predefined global constant STDIN retains the encoding set by #set_encoding when Encoding.default_external is changed
slow:The predefined global constant STDIN has the encodings set by #set_encoding
slow:The predefined global constant STDOUT has the encodings set by #set_encoding
2 changes: 1 addition & 1 deletion tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ class JT
def run(args)
args = args.dup

if args.empty? or !(args & %w[-h -help --help]).empty?
if args.empty? or %w[-h -help --help].include? args.first
help
exit
end