| author | April Chin <april.chin@oracle.com> |
| Mon, 04 May 2015 10:54:49 -0700 | |
| branch | s11-update |
| changeset 4241 | 9c60eb0ab04b |
| permissions | -rw-r--r-- |
|
4241
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
# Fix to test bug from upstream |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
# https://github.com/ruby/ruby/commit/05eb6111d9f7f6485d8d264cbb24e6e9836322b8 |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
# |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
--- ruby-2.1.5-orig/test/rubygems/test_gem_commands_contents_command.rb 2014-02-05 18:59:36.000000000 -0800 |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
+++ ruby-2.1.5/test/rubygems/test_gem_commands_contents_command.rb 2015-04-07 14:26:02.000000000 -0700 |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
@@ -169,10 +169,10 @@ |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
end |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
|
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
expected = [ |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
- File.join(RbConfig::CONFIG['bindir'], 'default_command'), |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
- File.join(RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'), |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
- File.join(RbConfig::CONFIG['archdir'], 'default_gem.so') |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
- ].sort.join "\n" |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
+ [RbConfig::CONFIG['bindir'], 'default_command'], |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
+ [RbConfig::CONFIG['rubylibdir'], 'default/gem.rb'], |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
+ [RbConfig::CONFIG['archdir'], 'default_gem.so'] |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
+ ].sort.map{|a|File.join a}.join "\n"
|
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
|
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
assert_equal expected, @ui.output.chomp |
|
9c60eb0ab04b
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
assert_equal "", @ui.error |