Merge pull request #760 from dmarcotte/bad-assert

Remove a bad assert and untag some tests it was affecting
jruby · May 24, 2013 · e507516 · e507516
2 parents 882879d + 7a874d2
commit e507516
Show file tree

Hide file tree

Showing 43 changed files with 1 addition and 99 deletions.
diff --git a/spec/tags/1.8/ruby/command_line/dash_a_tags.txt b/spec/tags/1.8/ruby/command_line/dash_a_tags.txt
diff --git a/spec/tags/1.8/ruby/command_line/dash_n_tags.txt b/spec/tags/1.8/ruby/command_line/dash_n_tags.txt
diff --git a/spec/tags/1.8/ruby/command_line/dash_p_tags.txt b/spec/tags/1.8/ruby/command_line/dash_p_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/each_line_tags.txt b/spec/tags/1.8/ruby/core/argf/each_line_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/each_tags.txt b/spec/tags/1.8/ruby/core/argf/each_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/eof_tags.txt b/spec/tags/1.8/ruby/core/argf/eof_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/file_tags.txt b/spec/tags/1.8/ruby/core/argf/file_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/filename_tags.txt b/spec/tags/1.8/ruby/core/argf/filename_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/fileno_tags.txt b/spec/tags/1.8/ruby/core/argf/fileno_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/gets_tags.txt b/spec/tags/1.8/ruby/core/argf/gets_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/lineno_tags.txt b/spec/tags/1.8/ruby/core/argf/lineno_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/path_tags.txt b/spec/tags/1.8/ruby/core/argf/path_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/pos_tags.txt b/spec/tags/1.8/ruby/core/argf/pos_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/readline_tags.txt b/spec/tags/1.8/ruby/core/argf/readline_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/readlines_tags.txt b/spec/tags/1.8/ruby/core/argf/readlines_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/rewind_tags.txt b/spec/tags/1.8/ruby/core/argf/rewind_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/seek_tags.txt b/spec/tags/1.8/ruby/core/argf/seek_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/skip_tags.txt b/spec/tags/1.8/ruby/core/argf/skip_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/to_a_tags.txt b/spec/tags/1.8/ruby/core/argf/to_a_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/to_i_tags.txt b/spec/tags/1.8/ruby/core/argf/to_i_tags.txt
diff --git a/spec/tags/1.8/ruby/core/argf/to_io_tags.txt b/spec/tags/1.8/ruby/core/argf/to_io_tags.txt
diff --git a/spec/tags/1.9/ruby/command_line/dash_a_tags.txt b/spec/tags/1.9/ruby/command_line/dash_a_tags.txt
diff --git a/spec/tags/1.9/ruby/command_line/dash_n_tags.txt b/spec/tags/1.9/ruby/command_line/dash_n_tags.txt
diff --git a/spec/tags/1.9/ruby/command_line/dash_p_tags.txt b/spec/tags/1.9/ruby/command_line/dash_p_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/each_line_tags.txt b/spec/tags/1.9/ruby/core/argf/each_line_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/each_tags.txt b/spec/tags/1.9/ruby/core/argf/each_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/eof_tags.txt b/spec/tags/1.9/ruby/core/argf/eof_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/file_tags.txt b/spec/tags/1.9/ruby/core/argf/file_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/filename_tags.txt b/spec/tags/1.9/ruby/core/argf/filename_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/fileno_tags.txt b/spec/tags/1.9/ruby/core/argf/fileno_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/gets_tags.txt b/spec/tags/1.9/ruby/core/argf/gets_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/lineno_tags.txt b/spec/tags/1.9/ruby/core/argf/lineno_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/path_tags.txt b/spec/tags/1.9/ruby/core/argf/path_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/pos_tags.txt b/spec/tags/1.9/ruby/core/argf/pos_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/readline_tags.txt b/spec/tags/1.9/ruby/core/argf/readline_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/readlines_tags.txt b/spec/tags/1.9/ruby/core/argf/readlines_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/rewind_tags.txt b/spec/tags/1.9/ruby/core/argf/rewind_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/seek_tags.txt b/spec/tags/1.9/ruby/core/argf/seek_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/skip_tags.txt b/spec/tags/1.9/ruby/core/argf/skip_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/to_a_tags.txt b/spec/tags/1.9/ruby/core/argf/to_a_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/to_i_tags.txt b/spec/tags/1.9/ruby/core/argf/to_i_tags.txt
diff --git a/spec/tags/1.9/ruby/core/argf/to_io_tags.txt b/spec/tags/1.9/ruby/core/argf/to_io_tags.txt
diff --git a/src/org/jruby/RubyArgsFile.java b/src/org/jruby/RubyArgsFile.java
@@ -234,10 +234,8 @@ private static IRubyObject argf_getline(ThreadContext context, IRubyObject recv,
                 retry = true;
             }
         }
-
-        assert line == null;
 
-        if (line != null && !line.isNil()) {
+        if (!line.isNil()) {
             context.runtime.setCurrentLine(data.currentLineNumber);
         }