| author | April Chin <april.chin@oracle.com> |
| Sun, 08 Dec 2013 21:13:26 -0800 | |
| branch | s11-update |
| changeset 2848 | 6223a5e1822c |
| permissions | -rw-r--r-- |
|
2848
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
Fixes a sporadic test problem with ruby. |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
See http://bugs.ruby-lang.org/issues/show/1714 |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
|
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
The fix is from this revision, which does not appear in |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
the latest ruby 1.8.7-p374: |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
http://bugs.ruby-lang.org/projects/ruby-18/repository/revisions/24668 |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
|
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
--- ruby-1.8.7-p374-orig/lib/test/unit/collector/dir.rb 2007-02-12 15:01:19.000000000 -0800 |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
+++ ruby-1.8.7-p374/lib/test/unit/collector/dir.rb 2013-12-05 17:46:31.105788000 -0800 |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
@@ -91,7 +91,7 @@ |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
end |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
|
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
ensure |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
- $:.delete_at($:.rindex(dir)) if(dir) |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
+ $:.delete_at($:.index(dir)) if(dir) |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
end |
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
|
|
6223a5e1822c
17884834 problem in UTILITY/RUBY
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
def realdir(path) |