Merge remote branch 'unstable/master'

* unstable/master: Prep for build 26900 Adjusted tags for latest RubySpecs Updated default.mspec to account for newest RubySpecs provide empty util.h, at least bcrypt-ruby #includes it expliicitely
MagLev · Sep 27, 2011 · 30cb657 · 30cb657
2 parents ea0b039 + f13ab95
commit 30cb657
Show file tree

Hide file tree

Showing 47 changed files with 190 additions and 77 deletions.
diff --git a/Changes b/Changes
@@ -2,7 +2,7 @@
 
   For more details see: http://bit.ly/d3C6S1
 
-== Changes for 26876 2011-09-23
+== Changes for 26900 2011-09-26
 * Fix 939, 942, 943, 944, 946, 947, 948, 949, 950, 951, 952
   812, 816, 847, 868, 910, 943
 * Fixed missing method in openssl for Rails 3.1.0 (sprockets).
@@ -13,7 +13,7 @@
 * Numerous bugfixes/enhancements in underlying GemStone 3.1 system
   - Fix 41773, 41761, 41814, 41606, 41762, 41756, 41709, 41817, 41819,
     41575, 41745, 41710, 41804, 41809, 41634, 41829, 41220, 41559, 40696,
-    41702, 39548, 41694, 41688, 41836, 41802, 39788, 41595
+    41702, 39548, 41694, 41688, 41836, 41802, 39788, 41595, 41592
   - initial cut at nested transactions (max 16 levels)
   - gracefully handle "offset from code memory ... exceeds 32bits" on Mac OS X.
   - further improvements in WebTools

diff --git a/README.rdoc b/README.rdoc
@@ -20,7 +20,7 @@ changes more slowly than the github version, and it has undergone more
 testing.
 
 You'll need to know a version number to install.
-The MagLev Alpha version on 2011-09-23 is <b>26876</b>.
+The MagLev Alpha version on 2011-09-26 is <b>26900</b>.
 Check for later versions on
 Twitter[http://twitter.com/maglev] or the
 {MagLev Discussion Google Group}[http://groups.google.com/group/maglev-discussion].
@@ -30,10 +30,10 @@ Twitter[http://twitter.com/maglev] or the
    {MagLev-installer.zip}[http://maglev.gemstone.com/files/MagLev-installer.zip]
    into the directory you've selected.
 1. If this is the first time you're installing MagLev, run:
-     ./installMaglev.sh 26876
+     ./installMaglev.sh 26900
    If you've already run <tt>installMaglev.sh</tt> on the machine, then you
    can use the upgrade script:
-     ./upgradeMaglev.sh 26876
+     ./upgradeMaglev.sh 26900
 
    <tt>installMaglev.sh</tt> runs one-time machine checks and configuration
    that ensure your hardware will run MagLev.  These mostly relate to

diff --git a/default.mspec b/default.mspec
@@ -8,34 +8,54 @@ class MSpecScript
   set :target, File.dirname(__FILE__) + '/bin/maglev-ruby'
 
   lang_files = ['spec/rubyspec/language',
-                "^spec/rubyspec/language/super_spec.rb",
+                "^spec/rubyspec/language/block_spec.rb",
+                "^spec/rubyspec/language/class_spec.rb",              # 26876
+                "^spec/rubyspec/language/constants_spec.rb",
                 "^spec/rubyspec/language/for_spec.rb",
-                "^spec/rubyspec/language/block_spec.rb"]
+                "^spec/rubyspec/language/proc_spec.rb",
+                "^spec/rubyspec/language/singleton_class_spec.rb",
+                "^spec/rubyspec/language/super_spec.rb",
+                "^spec/rubyspec/language/yield_spec.rb"]
 
   core_files = ['spec/rubyspec/core',
+                "^spec/rubyspec/core/argf/gets_spec.rb",              # Orpheus
+                "^spec/rubyspec/core/argf/readline_spec.rb",          # Orpheus
                 "^spec/rubyspec/core/argf/seek_spec.rb",
-            "^spec/rubyspec/core/basicobject",
-            "^spec/rubyspec/core/fixnum/right_shift_spec.rb",
-            "^spec/rubyspec/core/enumerable/cycle_spec.rb",
-            "^spec/rubyspec/core/kernel/system_spec.rb",
-            "^spec/rubyspec/core/file/ftype_spec.rb",             # Orpheus
-            "^spec/rubyspec/core/argf/readline_spec.rb",          # Orpheus
-            "^spec/rubyspec/core/file/stat/ftype_spec.rb",        # Orpheus
-            "^spec/rubyspec/core/argf/gets_spec.rb",              # Orpheus
-            "^spec/rubyspec/core/process/waitall_spec.rb",        # Grace
-            "^spec/rubyspec/core/file/flock_spec.rb", # Grace
+                "^spec/rubyspec/core/array/pack/b_spec.rb",           # 26876
+                "^spec/rubyspec/core/array/pack/p_spec.rb",           # 26876
+                "^spec/rubyspec/core/basicobject/basicobject_spec.rb",
+                "^spec/rubyspec/core/basicobject/not_equal_spec.rb",
+                "^spec/rubyspec/core/basicobject/not_spec.rb",
+                "^spec/rubyspec/core/class/allocate_spec.rb",
+                "^spec/rubyspec/core/class/dup_spec.rb",
+                "^spec/rubyspec/core/enumerable/cycle_spec.rb",
+                "^spec/rubyspec/core/file/flock_spec.rb",             # Grace
+                "^spec/rubyspec/core/file/ftype_spec.rb",             # Orpheus
+                "^spec/rubyspec/core/file/stat/ftype_spec.rb",        # Orpheus
+                "^spec/rubyspec/core/file/utime_spec.rb",
+                "^spec/rubyspec/core/fixnum/right_shift_spec.rb",
+                "^spec/rubyspec/core/float/round_spec.rb",            # 26876
+                "^spec/rubyspec/core/io/select_spec.rb",
+                "^spec/rubyspec/core/kernel/catch_spec.rb",           # 26876
                 "^spec/rubyspec/core/kernel/exec_spec.rb",
-                "^spec/rubyspec/core/process/wait_spec.rb",
+                "^spec/rubyspec/core/kernel/system_spec.rb",
+                "^spec/rubyspec/core/marshal/dump_spec.rb",
+                "^spec/rubyspec/core/numeric/step_spec.rb",           # 26876
+                "^spec/rubyspec/core/marshal/load_spec.rb",
+                "^spec/rubyspec/core/proc/arity_spec.rb",
                 "^spec/rubyspec/core/process/detach_spec.rb",
                 "^spec/rubyspec/core/process/wait2_spec.rb",
                 "^spec/rubyspec/core/process/waitall_spec.rb",
+                "^spec/rubyspec/core/process/waitall_spec.rb",        # Grace
+                "^spec/rubyspec/core/process/wait_spec.rb",
+                "^spec/rubyspec/core/range/step_spec.rb",             # 26876
+                "^spec/rubyspec/core/string/modulo_spec.rb",
                 "^spec/rubyspec/core/string/modulo_spec.rb",
                 "^spec/rubyspec/core/string/multiply_spec.rb",
-                "^spec/rubyspec/core/string/valid_encoding_spec.rb",
-                "^rubyspec/core/math", # Grace
                 "^spec/rubyspec/core/string/unpack/a_spec.rb",
-                "^spec/rubyspec/core/string/modulo_spec.rb",
-
+                "^spec/rubyspec/core/string/unpack/p_spec.rb",        # 26876
+                "^spec/rubyspec/core/string/unpack/u_spec.rb",        # 26876
+                "^spec/rubyspec/core/systemexit/success_spec.rb",     # 26876
                 "^spec/rubyspec/core/thread/alive_spec.rb",
                 "^spec/rubyspec/core/thread/exit_spec.rb",
                 "^spec/rubyspec/core/thread/inspect_spec.rb",
@@ -44,22 +64,77 @@ class MSpecScript
                 "^spec/rubyspec/core/thread/run_spec.rb",
                 "^spec/rubyspec/core/thread/status_spec.rb",
                 "^spec/rubyspec/core/thread/stop_spec.rb",
-                "^spec/rubyspec/core/thread/start_spec.rb",
                 "^spec/rubyspec/core/thread/terminate_spec.rb",
-                "^spec/rubyspec/core/thread/wakeup_spec.rb"]
+                "^spec/rubyspec/core/thread/wakeup_spec.rb",
+                "^spec/rubyspec/core/time/strftime_spec.rb"]          # 26876, Jupiter
 
   lib_files = ['spec/rubyspec/library',
-           "^spec/rubyspec/library/date/civil_spec.rb",
-               "^spec/rubyspec/library/net/http",
+               "^spec/rubyspec/library/complex/angle_spec.rb",
+               "^spec/rubyspec/library/complex/arg_spec.rb",
+               "^spec/rubyspec/library/complex/conj_spec.rb",
+               "^spec/rubyspec/library/complex/conjugate_spec.rb",
+               "^spec/rubyspec/library/complex/divide_spec.rb",
+               "^spec/rubyspec/library/complex/equal_value_spec.rb",
+               "^spec/rubyspec/library/complex/exponent_spec.rb",
+               "^spec/rubyspec/library/complex/math/acos_spec.rb",    # Grace
+               "^spec/rubyspec/library/complex/math/asin_spec.rb",    # Grace
+               "^spec/rubyspec/library/complex/math/log10_spec.rb",   # Grace
+               "^spec/rubyspec/library/complex/math/log_spec.rb",     # Grace
+               "^spec/rubyspec/library/complex/math/sqrt_spec.rb",
+               "^spec/rubyspec/library/complex/minus_spec.rb",
+               "^spec/rubyspec/library/complex/modulo_spec.rb",
+               "^spec/rubyspec/library/complex/multiply_spec.rb",
+               "^spec/rubyspec/library/complex/numeric/angle_spec.rb",
+               "^spec/rubyspec/library/complex/numeric/arg_spec.rb",
+               "^spec/rubyspec/library/complex/plus_spec.rb",
+               "^spec/rubyspec/library/etc/getgrgid_spec.rb",         # Orpheus, Grace
                "^spec/rubyspec/library/generator",
+               "^spec/rubyspec/library/iconv",                        # Grace
+               "^spec/rubyspec/library/matrix/I_spec.rb",             # 26876
+               "^spec/rubyspec/library/matrix/clone_spec.rb",         # 26876
+               "^spec/rubyspec/library/matrix/collect_spec.rb",       # 26876
+               "^spec/rubyspec/library/matrix/column_vector_spec.rb", # 26876
+               "^spec/rubyspec/library/matrix/columns_spec.rb",       # 26876
+               "^spec/rubyspec/library/matrix/divide_spec.rb",        # 26876
+               "^spec/rubyspec/library/matrix/identity_spec.rb",      # 26876
+               "^spec/rubyspec/library/matrix/inspect_spec.rb",       # 26876
+               "^spec/rubyspec/library/matrix/inv_spec.rb",           # 26876
+               "^spec/rubyspec/library/matrix/inverse_spec.rb",       # 26876
+               "^spec/rubyspec/library/matrix/map_spec.rb",           # 26876
+               "^spec/rubyspec/library/matrix/minor_spec.rb",         # 26876
+               "^spec/rubyspec/library/matrix/minus_spec.rb",         # 26876
+               "^spec/rubyspec/library/matrix/multiply_spec.rb",      # 26876
+               "^spec/rubyspec/library/matrix/plus_spec.rb",          # 26876
+               "^spec/rubyspec/library/matrix/row_vector_spec.rb",    # 26876
+               "^spec/rubyspec/library/matrix/t_spec.rb",             # 26876
+               "^spec/rubyspec/library/matrix/transpose_spec.rb",     # 26876
+               "^spec/rubyspec/library/matrix/unit_spec.rb",          # 26876
+               "^spec/rubyspec/library/matrix/zero_spec.rb",          # 26876
+               "^spec/rubyspec/library/net/http/httpheader/canonical_each_spec.rb",
+               "^spec/rubyspec/library/net/http/httpheader/content_range_spec.rb",
+               "^spec/rubyspec/library/net/http/httpheader/each_capitalized_name_spec.rb",
+               "^spec/rubyspec/library/net/http/httpheader/each_capitalized_spec.rb",
+               "^spec/rubyspec/library/net/http/httpheader/each_header_spec.rb",
+               "^spec/rubyspec/library/net/http/httpheader/each_key_spec.rb",
+               "^spec/rubyspec/library/net/http/httpheader/each_name_spec.rb",
+               "^spec/rubyspec/library/net/http/httpheader/each_spec.rb",
+               "^spec/rubyspec/library/net/http/httpheader/each_value_spec.rb",
+               "^spec/rubyspec/library/net/http/httpheader/fetch_spec.rb",
+               "^spec/rubyspec/library/net/http/http/request_spec.rb",
+               "^spec/rubyspec/library/net/http/http/request_spec.rb",
+               "^spec/rubyspec/library/net/http/httpresponse/body_spec.rb",
+               "^spec/rubyspec/library/net/http/httpresponse/entity_spec.rb",
+               "^spec/rubyspec/library/net/http/httpresponse/read_body_spec.rb",
+               "^spec/rubyspec/library/net/http/httpresponse/read_new_spec.rb",
+               "^spec/rubyspec/library/net/http/http/send_request_spec.rb",
+               "^spec/rubyspec/library/net/http/http/send_request_spec.rb",
+               "^spec/rubyspec/library/openstruct/element_set_spec.rb",
                "^spec/rubyspec/library/prime",
-               "^spec/rubyspec/library/socket",  # Orpheus, Grace
                "^spec/rubyspec/library/scanf",
-               "^spec/rubyspec/library/iconv",   # Grace
+               "^spec/rubyspec/library/socket",                       # Orpheus, Grace
                "^spec/rubyspec/library/syslog",
                "^spec/rubyspec/library/zlib/inflate/append_spec.rb",
-               "^spec/rubyspec/library/etc", # Grace
-               "^spec/rubyspec/library/complex", # Grace
+               "^spec/rubyspec/library/zlib/inflate/append_spec.rb",
                "^spec/rubyspec/library/zlib/inflate/inflate_spec.rb"]
 
   set :files, lang_files + core_files + lib_files

diff --git a/lib/ruby/1.8/include/util.h b/lib/ruby/1.8/include/util.h
diff --git a/spec/tags/core/array/pack/b_tags.txt b/spec/tags/core/array/pack/b_tags.txt
@@ -6,3 +6,5 @@ fails:Array#pack with format 'b' calls #to_str to coerce the directives string
 fails:Array#pack with format 'b' taints the output string if the format string is tainted
 fails:Array#pack with format 'b' raises a TypeError if #to_str does not return a String
 fails:Array#pack with format 'b' calls #to_str to convert an Object to a String
+fails:Array#pack with format 'B' ignores whitespace in the format string
+fails:Array#pack with format 'b' ignores whitespace in the format string
diff --git a/spec/tags/core/array/pack/p_tags.txt b/spec/tags/core/array/pack/p_tags.txt
@@ -0,0 +1,4 @@
+fails:Array#pack with format 'P' ignores whitespace in the format string
+fails:Array#pack with format 'P' calls #to_str to coerce the directives string
+fails:Array#pack with format 'P' taints the output string if the format string is tainted
+fails:Array#pack with format 'P' returns a String whose size is the number of bytes in a mochine word
diff --git a/spec/tags/core/float/round_tags.txt b/spec/tags/core/float/round_tags.txt
@@ -0,0 +1 @@
+fails:Float#round raises FloatDomainError for exceptional values
diff --git a/spec/tags/core/kernel/catch_tags.txt b/spec/tags/core/kernel/catch_tags.txt
@@ -0,0 +1,2 @@
+fails:Kernel.catch passes the given symbol to its block
+fails:Kernel.catch passes a symbol converted from the given string to its block
diff --git a/spec/tags/core/numeric/step_tags.txt b/spec/tags/core/numeric/step_tags.txt
@@ -7,3 +7,5 @@ fails:Numeric#step returns an Enumerator when not passed a block and self > stop
 fails:Numeric#step returns an Enumerator when not passed a block and self < stop
 fails:Numeric#step with [stop, step] increments self using #+ until self > stop when step > 0
 fails:Numeric#step with [stop, step] decrements self using #+ until self < stop when step < 0
+fails:Numeric#step Numeric#step with [stop, +step] when self, stop or step is a Float is careful about not yielding a value greater than limit
+fails:Numeric#step Numeric#step with [stop, -step] when self, stop or step is a Float is careful about not yielding a value smaller than limit
diff --git a/spec/tags/core/range/step_tags.txt b/spec/tags/core/range/step_tags.txt
@@ -1,2 +1,4 @@
 fails:Range#step raises a TypeError if the first element does not respond to #succ
 fails:Range#step returns an enumerator when no block given
+fails:Range#step given Float values and step returns float values of the form step * n + begin and never the end value if the range is exclusive
+fails:Range#step given Float values and step returns float values of the form step * n + begin and never bigger than the end value if the range is inclusive
diff --git a/spec/tags/core/string/unpack/p_tags.txt b/spec/tags/core/string/unpack/p_tags.txt
@@ -0,0 +1,3 @@
+fails:String#unpack with format 'P' ignores whitespace in the format string
+fails:String#unpack with format 'P' calls #to_str to coerce the directives string
+fails:String#unpack with format 'P' returns a random object after consuming a size-of a machine word bytes
diff --git a/spec/tags/core/string/unpack/u_tags.txt b/spec/tags/core/string/unpack/u_tags.txt
@@ -3,3 +3,4 @@ fails:String#unpack with format 'U' raises an ArgumentError when the format modi
 fails:String#unpack with format 'U' raises an ArgumentError when the format modifier is '!'
 fails:String#unpack with format 'u' calls #to_str to coerce the directives string
 fails:String#unpack with format 'u' decodes all ascii characters
+fails:String#unpack with format 'u' ignores whitespace in the format string
diff --git a/spec/tags/core/systemexit/success_tags.txt b/spec/tags/core/systemexit/success_tags.txt
@@ -0,0 +1,2 @@
+fails:SystemExit#success? returns true when the status is 0
+fails:SystemExit#success? returns false when the status is not 0
diff --git a/spec/tags/core/time/strftime_tags.txt b/spec/tags/core/time/strftime_tags.txt
@@ -1 +1,2 @@
 fails:Time#strftime returns the date alone with %x
+fails:Time#strftime returns the time alone with %X
diff --git a/spec/tags/language/block_tags.txt b/spec/tags/language/block_tags.txt
@@ -1 +1,18 @@
-fails:A block with mismatched arguments raises ArgumentError if argument is passed, but the block takes none
+fails:A block overwrites a captured local when used as an argument
+fails:A block taking |a| arguments assigns all the values yielded to the argument as an Array
+fails:A block taking |a, b| arguments calls #to_ary to convert a single yielded object to an Array
+fails:A block taking |a, b| arguments raises an TypeError if #to_ary does not return an Array
+fails:A block taking |a, *b| arguments calls #to_ary to convert a single yielded object to an Array
+fails:A block taking |a, *b| arguments does not call #to_ary if the single yielded object is an Array
+fails:A block taking |a, *b| arguments raises an TypeError if #to_ary does not return an Array
+fails:A block taking |*| arguments calls #to_ary to convert a single yielded object to an Array
+fails:A block taking |*| arguments raises an TypeError if #to_ary does not return an Array
+fails:A block taking |*a| arguments calls #to_ary to convert a single yielded object to an Array
+fails:A block taking |*a| arguments raises an TypeError if #to_ary does not return an Array
+fails:A block taking |a, | arguments calls #to_ary to convert a single yielded object to an Array
+fails:A block taking |a, | arguments raises an TypeError if #to_ary does not return an Array
+fails:A block taking |(a, b)| arguments calls #to_ary to convert a single yielded object to an Array
+fails:A block taking |(a, b)| arguments raises an TypeError if #to_ary does not return an Array
+fails:A block taking |(a, b), c| arguments calls #to_ary to convert a single yielded object to an Array
+fails:A block taking |(a, b), c| arguments does not call #to_ary if the single yielded object is an Array
+fails:A block taking |(a, b), c| arguments raises an TypeError if #to_ary does not return an Array
diff --git a/spec/tags/language/break_tags.txt b/spec/tags/language/break_tags.txt
@@ -5,6 +5,3 @@ fails:The break statement in a captured block from a scope that has returned rai
 fails:The break statement in a captured block from a scope that has returned raises a LocalJumpError when yielding to the block
 fails:The break statement in a lambda when the invocation of the scope creating the lambda is still active raises a LocalJumpError when yielding to a lambda passed as a block argument
 fails:The break statement in a lambda from a scope that has returned raises a LocalJumpError when yielding to a lambda passed as a block argument
-fails:The break statement in a lambda created at the toplevel returns a value when invoking from the toplevel
-fails:The break statement in a lambda created at the toplevel returns a value when invoking from a method
-fails:The break statement in a lambda created at the toplevel returns a value when invoking from a block
diff --git a/spec/tags/language/catch_tags.txt b/spec/tags/language/catch_tags.txt
diff --git a/spec/tags/language/class_tags.txt b/spec/tags/language/class_tags.txt
@@ -1,2 +1,4 @@
 fails:A class definition allows using self as the superclass if self is a class
 fails:A class definition extending an object (sclass) can use return to cause the enclosing method to return
+fails:An anonymous class takes on the name of the first constant it is assigned to
+fails:An anonymous class forces named nested classes to be anonymous
diff --git a/spec/tags/language/constants_tags.txt b/spec/tags/language/constants_tags.txt
@@ -0,0 +1 @@
+fails:Literal (A::X) constant resolution with dynamically assigned constants evaluates the right hand side before evaluating a constant path
diff --git a/spec/tags/language/def_tags.txt b/spec/tags/language/def_tags.txt
diff --git a/spec/tags/language/eigenclass_tags.txt b/spec/tags/language/eigenclass_tags.txt
diff --git a/spec/tags/language/method_tags.txt b/spec/tags/language/method_tags.txt