backport r48370 from ruby/ruby trunk

gramos · Nov 11, 2014 · 318ec40 · 318ec40
1 parent 744e413
commit 318ec40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb
@@ -102,7 +102,7 @@ def files_in_gem spec
   end
 
   def files_in_default_gem spec
-    spec.files.sort.map do |file|
+    spec.files.map do |file|
       case file
       when /\A#{spec.bindir}\//
         [RbConfig::CONFIG['bindir'], $POSTMATCH]

diff --git a/test/rubygems/test_gem_commands_contents_command.rb b/test/rubygems/test_gem_commands_contents_command.rb
@@ -203,10 +203,10 @@ def test_execute_default_gem
     end
 
     expected = [
-      File.join(RbConfig::CONFIG['bindir'], 'default_command'),
-      File.join(RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'),
-      File.join(RbConfig::CONFIG['archdir'], 'default_gem.so')
-    ].sort.join "\n"
+      [RbConfig::CONFIG['bindir'], 'default_command'],
+      [RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'],
+      [RbConfig::CONFIG['archdir'].sub(/x86_64/,'armv7l'), 'default_gem.so']
+    ].sort.map{|a|File.join a}.join "\n"
 
     assert_equal expected, @ui.output.chomp
     assert_equal "", @ui.error