author | April Chin <april.chin@oracle.com> |
Tue, 28 Apr 2015 15:47:06 -0700 | |
changeset 4210 | d367c184f47f |
permissions | -rw-r--r-- |
4210
d367c184f47f
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 |
d367c184f47f
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/cc02a4ab7b71215de89c6bcfddc2fb2ef6f587be |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
# which has not been applied to this version of Ruby |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
|
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
diff -rup ruby-2.1.5-orig/lib/rubygems/test_case.rb ruby-2.1.5/lib/rubygems/test_case.rb |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
--- ruby-2.1.5-orig/lib/rubygems/test_case.rb 2014-02-05 18:59:36.000000000 -0800 |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
+++ ruby-2.1.5/lib/rubygems/test_case.rb 2015-04-03 16:45:09.901221000 -0700 |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
@@ -2,7 +2,7 @@ |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
|
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
begin |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
gem 'minitest', '~> 4.0' |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
-rescue NoMethodError |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
+rescue NoMethodError, Gem::LoadError |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
# for ruby tests |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
end |
d367c184f47f
PSARC/2015/113 Add Ruby 2.1 and EOF and Remove Ruby 1.9
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |