jruby · Aug 22, 2015 · Aug 22, 2015 · Aug 22, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -79,6 +79,7 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: COMMAND=test/truffle/run.sh
+    - env: PHASE='-Ptruffle-mri-tests'
 
 
 branches:

diff --git a/spec/truffle/tags/core/argf/gets_tags.txt b/spec/truffle/tags/core/argf/gets_tags.txt
@@ -2,3 +2,4 @@ fails:ARGF.gets sets $_ global variable with each line read
 fails:ARGF.gets modifies the files when in place edit mode is on
 fails:ARGF.gets modifies and backups two files when in place edit mode is on
 slow:ARGF.gets reads all lines of stdin
+fails:ARGF.gets reads all lines of stdin
diff --git a/spec/truffle/tags/core/argf/read_tags.txt b/spec/truffle/tags/core/argf/read_tags.txt
@@ -1,3 +1,6 @@
 slow:ARGF.read reads the contents of stdin
 slow:ARGF.read reads a number of bytes from stdin
 slow:ARGF.read reads the contents of one file and stdin
+fails:ARGF.read reads the contents of stdin
+fails:ARGF.read reads a number of bytes from stdin
+fails:ARGF.read reads the contents of one file and stdin
diff --git a/spec/truffle/tags/core/argf/readline_tags.txt b/spec/truffle/tags/core/argf/readline_tags.txt
@@ -2,3 +2,4 @@ fails:ARGF.readline sets $_ global variable with each line read
 fails:ARGF.readline modifies the files when in place edit mode is on
 fails:ARGF.readline modifies and backups two files when in place edit mode is on
 slow:ARGF.readline reads all lines of stdin
+fails:ARGF.readline reads all lines of stdin
diff --git a/spec/truffle/tags/core/argf/set_encoding_tags.txt b/spec/truffle/tags/core/argf/set_encoding_tags.txt
@@ -2,3 +2,7 @@ slow:ARGF.set_encoding sets the external encoding when passed an encoding instan
 slow:ARGF.set_encoding sets the external encoding when passed an encoding name
 slow:ARGF.set_encoding sets the external, internal encoding when passed two encoding instances
 slow:ARGF.set_encoding sets the external, internal encoding when passed 'ext:int' String
+fails:ARGF.set_encoding sets the external encoding when passed an encoding instance
+fails:ARGF.set_encoding sets the external encoding when passed an encoding name
+fails:ARGF.set_encoding sets the external, internal encoding when passed two encoding instances
+fails:ARGF.set_encoding sets the external, internal encoding when passed 'ext:int' String
diff --git a/spec/truffle/tags/core/encoding/default_external_tags.txt b/spec/truffle/tags/core/encoding/default_external_tags.txt
@@ -3,3 +3,6 @@ windows:Encoding.default_external with command line options returns the encoding
 slow:Encoding.default_external with command line options is not changed by the -U option
 slow:Encoding.default_external with command line options returns the encoding specified by '-E external'
 slow:Encoding.default_external with command line options returns the encoding specified by '-E external:'
+fails:Encoding.default_external with command line options is not changed by the -U option
+fails:Encoding.default_external with command line options returns the encoding specified by '-E external'
+fails:Encoding.default_external with command line options returns the encoding specified by '-E external:'
diff --git a/spec/truffle/tags/core/encoding/default_internal_tags.txt b/spec/truffle/tags/core/encoding/default_internal_tags.txt
@@ -4,3 +4,6 @@ windows:Encoding.default_internal with command line options uses the encoding sp
 slow:Encoding.default_internal with command line options returns Encoding::UTF_8 if ruby was invoked with -U
 slow:Encoding.default_internal with command line options uses the encoding specified when ruby is invoked with an '-E :internal' argument
 slow:Encoding.default_internal with command line options uses the encoding specified when ruby is invoked with an '-E external:internal' argument
+fails:Encoding.default_internal with command line options returns Encoding::UTF_8 if ruby was invoked with -U
+fails:Encoding.default_internal with command line options uses the encoding specified when ruby is invoked with an '-E :internal' argument
+fails:Encoding.default_internal with command line options uses the encoding specified when ruby is invoked with an '-E external:internal' argument
diff --git a/spec/truffle/tags/core/kernel/at_exit_tags.txt b/spec/truffle/tags/core/kernel/at_exit_tags.txt
@@ -3,3 +3,6 @@ slow:Kernel.at_exit runs in reverse order of registration
 slow:Kernel.at_exit allows calling exit inside at_exit handler
 slow:Kernel.at_exit gives access to the last raised exception
 fails:Kernel.at_exit gives access to the last raised exception
+fails:Kernel.at_exit runs after all other code
+fails:Kernel.at_exit runs in reverse order of registration
+fails:Kernel.at_exit allows calling exit inside at_exit handler
diff --git a/spec/truffle/tags/core/kernel/autoload_tags.txt b/spec/truffle/tags/core/kernel/autoload_tags.txt
@@ -1 +1,2 @@
 slow:Kernel#autoload when Object is frozen raises a RuntimeError before defining the constant
+fails:Kernel#autoload when Object is frozen raises a RuntimeError before defining the constant
diff --git a/spec/truffle/tags/core/kernel/exec_tags.txt b/spec/truffle/tags/core/kernel/exec_tags.txt
@@ -72,3 +72,9 @@ slow:Kernel.exec with a command array uses the first element as the command name
 slow:Kernel.exec with a command array coerces the argument using to_ary
 slow:Kernel.exec with a command array raises an ArgumentError if the Array does not have exactly two elements
 slow:Kernel.exec with an options Hash with Integer option keys maps the key to a file descriptor in the child that inherits the file descriptor from the parent specified by the value
+fails:Kernel#exec flushes STDOUT upon exit when it's not set to sync
+fails:Kernel#exec flushes STDERR upon exit when it's not set to sync
+fails:Kernel#exec with multiple arguments does not subject the arguments to shell expansion
+fails:Kernel.exec flushes STDOUT upon exit when it's not set to sync
+fails:Kernel.exec flushes STDERR upon exit when it's not set to sync
+fails:Kernel.exec with multiple arguments does not subject the arguments to shell expansion
diff --git a/spec/truffle/tags/core/process/exec_tags.txt b/spec/truffle/tags/core/process/exec_tags.txt
@@ -37,3 +37,5 @@ slow:Process.exec with a command array coerces the argument using to_ary
 slow:Process.exec with a command array raises an ArgumentError if the Array does not have exactly two elements
 slow:Process.exec with an options Hash with Integer option keys maps the key to a file descriptor in the child that inherits the file descriptor from the parent specified by the value
 fails:Process.exec flushes STDOUT upon exit when it's not set to sync
+fails:Process.exec with multiple arguments does not subject the arguments to shell expansion
+
diff --git a/spec/truffle/tags/language/predefined/data_tags.txt b/spec/truffle/tags/language/predefined/data_tags.txt
@@ -10,3 +10,4 @@ windows:The DATA constant exists when the main script contains __END__
 windows:The DATA constant does not exist when the main script contains no __END__
 windows:The DATA constant does not change when an included files also has a __END__
 fails:The DATA constant exists when the main script contains __END__
+fails:The DATA constant does not exist when the main script contains no __END__
diff --git a/spec/truffle/tags/language/predefined_tags.txt b/spec/truffle/tags/language/predefined_tags.txt
@@ -10,3 +10,7 @@ windows:The predefined global constant STDERR has the encodings set by #set_enco
 fails:Predefined global $_ is set to the last line read by e.g. StringIO#gets
 fails:Predefined global $_ is set at the method-scoped level rather than block-scoped
 fails:Global variable $0 actually sets the program name
+fails:The predefined global constant STDIN has the encodings set by #set_encoding
+fails:The predefined global constant STDIN retains the encoding set by #set_encoding when Encoding.default_external is changed
+fails:The predefined global constant STDOUT has the encodings set by #set_encoding
+fails:The predefined global constant STDERR has the encodings set by #set_encoding
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/array/BasicArrayMirror.java b/truffle/src/main/java/org/jruby/truffle/runtime/array/BasicArrayMirror.java
@@ -10,6 +10,7 @@
 package org.jruby.truffle.runtime.array;
 
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 public abstract class BasicArrayMirror implements ArrayMirror {
 
@@ -46,7 +47,11 @@ public boolean hasNext() {
                     }
 
                     @Override
-                    public Object next() {
+                    public Object next() throws NoSuchElementException {
+                        if (n >= length) {
+                            throw new NoSuchElementException();
+                        }
+
                         final Object object = get(n);
                         n++;
                         return object;

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/loader/SourceLoader.java b/truffle/src/main/java/org/jruby/truffle/runtime/loader/SourceLoader.java
@@ -15,6 +15,7 @@
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 
 public class SourceLoader {
 
@@ -44,7 +45,7 @@ private Source loadInlineScript() {
     }
 
     private Source loadResource(String canonicalPath) throws IOException {
-        if (!canonicalPath.toLowerCase().endsWith(".rb")) {
+        if (!canonicalPath.toLowerCase(Locale.ENGLISH).endsWith(".rb")) {
             throw new FileNotFoundException(canonicalPath);
         }
 
@@ -67,7 +68,7 @@ private Source loadResource(String canonicalPath) throws IOException {
             throw new FileNotFoundException(canonicalPath);
         }
 
-        return Source.fromReader(new InputStreamReader(stream), canonicalPath);
+        return Source.fromReader(new InputStreamReader(stream, StandardCharsets.UTF_8), canonicalPath);
     }
 
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		slow:Kernel#autoload when Object is frozen raises a RuntimeError before defining the constant
		fails:Kernel#autoload when Object is frozen raises a RuntimeError before defining the constant