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

Commits on Mar 17, 2015

  1. [Truffle] Tag failing core specs.

    @eregon
    eregon committed Mar 17, 2015
    Copy the full SHA
    28e8a6d View commit details

  2. [Truffle] Add Thread#join(nil).

    @eregon
    eregon committed Mar 17, 2015
    Copy the full SHA
    edafd13 View commit details
Showing with 74 additions and 0 deletions.
  1. +4 −0 spec/truffle/tags/core/file/open_tags.txt
  2. +1 −0 spec/truffle/tags/core/hash/assoc_tags.txt
  3. +2 −0 spec/truffle/tags/core/hash/compare_by_identity_tags.txt
  4. +1 −0 spec/truffle/tags/core/hash/reject_tags.txt
  5. +1 −0 spec/truffle/tags/core/io/gets_tags.txt
  6. +3 −0 spec/truffle/tags/core/io/open_tags.txt
  7. +1 −0 spec/truffle/tags/core/io/write_tags.txt
  8. +2 −0 spec/truffle/tags/core/kernel/__dir___tags.txt
  9. +5 −0 spec/truffle/tags/core/kernel/caller_locations_tags.txt
  10. +1 −0 spec/truffle/tags/core/kernel/caller_tags.txt
  11. +1 −0 spec/truffle/tags/core/kernel/instance_variable_get_tags.txt
  12. +1 −0 spec/truffle/tags/core/kernel/proc_tags.txt
  13. +2 −0 spec/truffle/tags/core/kernel/taint_tags.txt
  14. +1 −0 spec/truffle/tags/core/kernel/untrusted_tags.txt
  15. +1 −0 spec/truffle/tags/core/module/alias_method_tags.txt
  16. +1 −0 spec/truffle/tags/core/module/const_defined_tags.txt
  17. +3 −0 spec/truffle/tags/core/module/define_method_tags.txt
  18. +25 −0 spec/truffle/tags/core/range/bsearch_tags.txt
  19. BIN spec/truffle/tags/core/string/lstrip_tags.txt
  20. +1 −0 spec/truffle/tags/core/thread/backtrace/location/absolute_path_tags.txt
  21. +1 −0 spec/truffle/tags/core/thread/backtrace/location/base_label_tags.txt
  22. +1 −0 spec/truffle/tags/core/thread/backtrace/location/inspect_tags.txt
  23. +1 −0 spec/truffle/tags/core/thread/backtrace/location/label_tags.txt
  24. +1 −0 spec/truffle/tags/core/thread/backtrace/location/lineno_tags.txt
  25. +7 −0 spec/truffle/tags/core/thread/backtrace/location/path_tags.txt
  26. +1 −0 spec/truffle/tags/core/thread/backtrace/location/to_s_tags.txt
  27. +5 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadNodes.java
4 changes: 4 additions & 0 deletions spec/truffle/tags/core/file/open_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -69,3 +69,7 @@ fails:File.open on a FIFO opens it as a normal file
fails:File.open when passed a file descriptor opens a file
fails:File.open when passed a file descriptor opens a file when passed a block
fails:File.open opens directories
fails:File.open opens the file when call with fd
fails:File.open opens a file with a file descriptor d and a block
fails:File.open with a block propagates StandardErrors produced by close
fails:File.open with a block does not propagate IOError with 'closed stream' message produced by close
1 change: 1 addition & 0 deletions spec/truffle/tags/core/hash/assoc_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Hash#assoc only returns the first matching key-value pair for identity hashes
2 changes: 2 additions & 0 deletions spec/truffle/tags/core/hash/compare_by_identity_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fails:Hash#compare_by_identity causes future comparisons on the receiver to be made by identity
fails:Hash#compare_by_identity uses the semantics of BasicObject#equal? to determine key identity
1 change: 1 addition & 0 deletions spec/truffle/tags/core/hash/reject_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Hash#reject taints the resulting hash
1 change: 1 addition & 0 deletions spec/truffle/tags/core/io/gets_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -40,3 +40,4 @@ fails:IO#gets transcodes into the IO object's internal encoding, when set
fails:IO#gets overwrites the default external encoding with the IO object's own external encoding
fails:IO#gets ignores the internal encoding if the default external encoding is ASCII-8BIT
fails:IO#gets ignores the internal encoding if the IO object's external encoding is ASCII-8BIT
fails:IO#gets transcodes to internal encoding if the IO object's external encoding is ASCII-8BIT
3 changes: 3 additions & 0 deletions spec/truffle/tags/core/io/open_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -53,3 +53,6 @@ fails:IO.open does not propagate a StandardError raised by #close
fails:IO.open does not set last error when a StandardError raised by #close
fails:IO.open creates an IO instance when STDOUT is closed
fails:IO.open creates an IO instance when STDERR is closed
fails:IO.open propagates an exception raised by #close that is a StandardError
fails:IO.open does not propagate a IOError with 'closed stream' message raised by #close
fails:IO.open does not set last error when a IOError with 'closed stream' raised by #close
1 change: 1 addition & 0 deletions spec/truffle/tags/core/io/write_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -31,3 +31,4 @@ fails:IO#write advances the file position by the count of given bytes
fails:IO#write raises IOError on closed stream
fails(windows):IO#write on Windows normalizes line endings in text mode
fails(windows):IO#write on Windows does not normalize line endings in binary mode
fails:IO.write on a FIFO writes correctly
2 changes: 2 additions & 0 deletions spec/truffle/tags/core/kernel/__dir___tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
fails:Kernel#__dir__ returns the name of the directory containing the currently-executing file
fails:Kernel#__dir__ when used in eval with top level binding returns the name of the directory containing the currently-executing file
fails:Kernel#__dir__ returns the real name of the directory containing the currently-executing file
fails:Kernel#__dir__ when used in eval with top level binding returns the real name of the directory containing the currently-executing file
5 changes: 5 additions & 0 deletions spec/truffle/tags/core/kernel/caller_locations_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
fails:Kernel#caller_locations is a private method
fails:Kernel#caller_locations returns an Array of caller locations
fails:Kernel#caller_locations returns an Array of caller locations using a custom offset
fails:Kernel#caller_locations returns an Array of caller locations using a custom limit
fails:Kernel#caller_locations returns the locations as Thread::Backtrace::Location instances
1 change: 1 addition & 0 deletions spec/truffle/tags/core/kernel/caller_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Kernel#caller returns an Array of caller locations using a custom limit
1 change: 1 addition & 0 deletions spec/truffle/tags/core/kernel/instance_variable_get_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -5,3 +5,4 @@ fails:Kernel#instance_variable_get when passed Symbol raises a NameError when pa
fails:Kernel#instance_variable_get when passed Symbol raises a NameError when the passed Symbol is an invalid instance variable name
fails:Kernel#instance_variable_get when passed String raises a NameError when the passed String is an invalid instance variable name
fails:Kernel#instance_variable_get when passed String raises a NameError when passed '@' as an instance variable name
fails:Kernel#instance_variable_get raises a NameError when passed just '@'
1 change: 1 addition & 0 deletions spec/truffle/tags/core/kernel/proc_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
fails:Kernel.proc raises an ArgumentError when no block is given
fails:Kernel#proc uses the implicit block from an enclosing method
2 changes: 2 additions & 0 deletions spec/truffle/tags/core/kernel/taint_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -2,3 +2,5 @@ fails:Kernel#taint raises RuntimeError on an untainted, frozen object
fails:Kernel#taint has no effect on immediate values
fails:Kernel#taint on a Bignum raises a RuntimeError
fails:Kernel#taint on a Symbol raises a RuntimeError
fails:Kernel#taint no raises a RuntimeError on symbols
fails:Kernel#taint no raises error on fixnum values
1 change: 1 addition & 0 deletions spec/truffle/tags/core/kernel/untrusted_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
fails:Kernel#untrusted? returns the untrusted status of an object
fails:Kernel#untrusted? has no effect on immediate values
fails:Kernel#untrusted? has effect on immediate values
1 change: 1 addition & 0 deletions spec/truffle/tags/core/module/alias_method_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -5,3 +5,4 @@ fails:Module#alias_method aliasing special methods keeps initialize_copy private
fails:Module#alias_method aliasing special methods keeps initialize_clone private when aliasing
fails:Module#alias_method aliasing special methods keeps initialize_dup private when aliasing
fails:Module#alias_method aliasing special methods keeps respond_to_missing? private when aliasing
fails:Module#alias_method preserves the arguments information of the original methods
1 change: 1 addition & 0 deletions spec/truffle/tags/core/module/const_defined_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -11,3 +11,4 @@ fails:Module#const_defined? raises a NameError if the name starts with '@'
fails:Module#const_defined? raises a NameError if the name starts with '!'
fails:Module#const_defined? raises a NameError if the name contains non-alphabetic characters except '_'
fails:Module#const_defined? raises a TypeError if conversion to a String by calling #to_str fails
fails:Module#const_defined? returns true or false for the nested name
3 changes: 3 additions & 0 deletions spec/truffle/tags/core/module/define_method_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -10,3 +10,6 @@ fails:Module#define_method when name is :initialize given an UnboundMethod sets
fails:Method#define_method when passed a Method object defines a method with the same #parameters as the original
fails:Method#define_method when passed an UnboundMethod object defines a method with the same #arity as the original
fails:Method#define_method when passed an UnboundMethod object defines a method with the same #parameters as the original
fails:Module#define_method allows an UnboundMethod from a module to be defined on a class
fails:Module#define_method allows an UnboundMethod from a parent class to be defined on a child class
fails:Module#define_method allows an UnboundMethod from a module to be defined on another unrelated module
25 changes: 25 additions & 0 deletions spec/truffle/tags/core/range/bsearch_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
fails:Range#bsearch returns an Enumerator when not passed a block
fails:Range#bsearch raises a TypeError if the block returns an Object
fails:Range#bsearch raises a TypeError if the block returns a String
fails:Range#bsearch raises a TypeError if the Range has Object values
fails:Range#bsearch raises a TypeError if the Range has String values
fails:Range#bsearch with Integer values with a block returning true or false returns nil if the block returns false for every element
fails:Range#bsearch with Integer values with a block returning true or false returns nil if the block returns nil for every element
fails:Range#bsearch with Integer values with a block returning true or false returns minimum element if the block returns true for every element
fails:Range#bsearch with Integer values with a block returning true or false returns the smallest element for which block returns true
fails:Range#bsearch with Integer values with a block returning negative, zero, positive numbers returns nil if the block returns less than zero for every element
fails:Range#bsearch with Integer values with a block returning negative, zero, positive numbers returns nil if the block returns greater than zero for every element
fails:Range#bsearch with Integer values with a block returning negative, zero, positive numbers returns nil if the block never returns zero
fails:Range#bsearch with Integer values with a block returning negative, zero, positive numbers accepts (+/-)Float::INFINITY from the block
fails:Range#bsearch with Integer values with a block returning negative, zero, positive numbers returns an element at an index for which block returns 0.0
fails:Range#bsearch with Integer values with a block returning negative, zero, positive numbers returns an element at an index for which block returns 0
fails:Range#bsearch with Float values with a block returning true or false returns nil if the block returns false for every element
fails:Range#bsearch with Float values with a block returning true or false returns nil if the block returns nil for every element
fails:Range#bsearch with Float values with a block returning true or false returns minimum element if the block returns true for every element
fails:Range#bsearch with Float values with a block returning true or false returns the smallest element for which block returns true
fails:Range#bsearch with Float values with a block returning negative, zero, positive numbers returns nil if the block returns less than zero for every element
fails:Range#bsearch with Float values with a block returning negative, zero, positive numbers returns nil if the block returns greater than zero for every element
fails:Range#bsearch with Float values with a block returning negative, zero, positive numbers returns nil if the block never returns zero
fails:Range#bsearch with Float values with a block returning negative, zero, positive numbers accepts (+/-)Float::INFINITY from the block
fails:Range#bsearch with Float values with a block returning negative, zero, positive numbers returns an element at an index for which block returns 0.0
fails:Range#bsearch with Float values with a block returning negative, zero, positive numbers returns an element at an index for which block returns 0
Binary file modified spec/truffle/tags/core/string/lstrip_tags.txt
View file
Binary file not shown.
1 change: 1 addition & 0 deletions spec/truffle/tags/core/thread/backtrace/location/absolute_path_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Thread::Backtrace::Location#absolute_path returns the absolute path of the call frame
1 change: 1 addition & 0 deletions spec/truffle/tags/core/thread/backtrace/location/base_label_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Thread::Backtrace::Location#base_label returns the base label of the call frame
1 change: 1 addition & 0 deletions spec/truffle/tags/core/thread/backtrace/location/inspect_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Thread::Backtrace::Location#inspect converts the call frame to a String
1 change: 1 addition & 0 deletions spec/truffle/tags/core/thread/backtrace/location/label_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Thread::Backtrace::Location#label returns the base label of the call frame
1 change: 1 addition & 0 deletions spec/truffle/tags/core/thread/backtrace/location/lineno_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Thread::Backtrace::Location#lineno returns the absolute path of the call frame
7 changes: 7 additions & 0 deletions spec/truffle/tags/core/thread/backtrace/location/path_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
fails:Thread::Backtrace::Location#path outside a main script returns an absolute path
fails:Thread::Backtrace::Location#path in a main script when the script is in the working directory when using a relative script path returns a path relative to the working directory
fails:Thread::Backtrace::Location#path in a main script when the script is in the working directory when using an absolute script path returns an absolute path
fails:Thread::Backtrace::Location#path in a main script when the script is in a sub directory of the working directory when using a relative script path returns a path relative to the working directory
fails:Thread::Backtrace::Location#path in a main script when the script is in a sub directory of the working directory when using an absolute script path returns an absolute path
fails:Thread::Backtrace::Location#path in a main script when the script is outside of the working directory when using a relative script path returns a path relative to the working directory
fails:Thread::Backtrace::Location#path in a main script when the script is outside of the working directory when using an absolute path returns an absolute path
1 change: 1 addition & 0 deletions spec/truffle/tags/core/thread/backtrace/location/to_s_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:Thread::Backtrace::Location#to_s converts the call frame to a String
5 changes: 5 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadNodes.java
View file
Original file line number Diff line number Diff line change
@@ -155,6 +155,11 @@ public RubyThread join(RubyThread thread, UndefinedPlaceholder timeout) {
return thread;
}

@Specialization
public RubyThread join(RubyThread thread, RubyNilClass timeout) {
return join(thread, UndefinedPlaceholder.INSTANCE);
}

@Specialization
public Object join(RubyThread thread, int timeout) {
notDesignedForCompilation();