1 |
graaff 12/04/30 08:23:54 |
2 |
|
3 |
Added: rdoc-fix-hash-ordering-tests.patch |
4 |
Log: |
5 |
Fix ruby 1.8 hash ordering test failures, bug 397657. Fix racc file generation. Avoid test requiring FEATURES=userpriv, bug 361959. |
6 |
|
7 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-ruby/rdoc/files/rdoc-fix-hash-ordering-tests.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rdoc/files/rdoc-fix-hash-ordering-tests.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rdoc/files/rdoc-fix-hash-ordering-tests.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: rdoc-fix-hash-ordering-tests.patch |
16 |
=================================================================== |
17 |
commit 2d606b3ca1378edf1c42ad58877c9bdaabf79480 |
18 |
Author: Eric Hodel <drbrain@××××××××.net> |
19 |
Date: Sun Mar 11 18:00:21 2012 -0700 |
20 |
|
21 |
Fix hash-order-dependent tests |
22 |
|
23 |
diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb |
24 |
index a3ca813..149a808 100644 |
25 |
--- a/lib/rdoc/ri/driver.rb |
26 |
+++ b/lib/rdoc/ri/driver.rb |
27 |
@@ -723,7 +723,7 @@ Options may also be set in the 'RI' environment variable. |
28 |
page do |io| |
29 |
io.puts "#{name} not found, maybe you meant:" |
30 |
io.puts |
31 |
- io.puts matches.join("\n") |
32 |
+ io.puts matches.sort.join("\n") |
33 |
end |
34 |
|
35 |
false |
36 |
diff --git a/test/test_rdoc_context.rb b/test/test_rdoc_context.rb |
37 |
index 192a287..52f579c 100644 |
38 |
--- a/test/test_rdoc_context.rb |
39 |
+++ b/test/test_rdoc_context.rb |
40 |
@@ -340,7 +340,7 @@ class TestRDocContext < XrefTestCase |
41 |
|
42 |
def test_classes |
43 |
assert_equal %w[C2::C3], @c2.classes.map { |k| k.full_name } |
44 |
- assert_equal %w[C3::H1 C3::H2], @c3.classes.map { |k| k.full_name } |
45 |
+ assert_equal %w[C3::H1 C3::H2], @c3.classes.map { |k| k.full_name }.sort |
46 |
end |
47 |
|
48 |
def test_current_section |
49 |
diff --git a/test/test_rdoc_parser_ruby.rb b/test/test_rdoc_parser_ruby.rb |
50 |
index 1ff6f4d..18964f9 100644 |
51 |
--- a/test/test_rdoc_parser_ruby.rb |
52 |
+++ b/test/test_rdoc_parser_ruby.rb |
53 |
@@ -701,7 +701,7 @@ end |
54 |
|
55 |
@parser.parse_class @top_level, false, @parser.get_tk, @comment |
56 |
|
57 |
- assert_equal %w[A B], RDoc::TopLevel.classes.map { |c| c.full_name } |
58 |
+ assert_equal %w[A B], RDoc::TopLevel.classes.map { |c| c.full_name }.sort |
59 |
end |
60 |
|
61 |
def test_parse_class_single |
62 |
@@ -720,10 +720,12 @@ end |
63 |
|
64 |
@parser.parse_class @top_level, false, @parser.get_tk, @comment |
65 |
|
66 |
- assert_equal %w[A], RDoc::TopLevel.classes.map { |c| c.full_name } |
67 |
- assert_equal %w[A::B A::d], RDoc::TopLevel.modules.map { |c| c.full_name } |
68 |
+ assert_equal %w[A], RDoc::TopLevel.classes.map { |c| c.full_name } |
69 |
|
70 |
- b = RDoc::TopLevel.modules.first |
71 |
+ modules = RDoc::TopLevel.modules.sort_by { |c| c.full_name } |
72 |
+ assert_equal %w[A::B A::d], modules.map { |c| c.full_name } |
73 |
+ |
74 |
+ b = modules.first |
75 |
assert_equal 10, b.offset |
76 |
assert_equal 2, b.line |
77 |
|
78 |
@@ -1851,10 +1853,10 @@ end |
79 |
|
80 |
@parser.parse_statements @top_level |
81 |
|
82 |
- date, date_time = @top_level.classes |
83 |
+ date, date_time = @top_level.classes.sort_by { |c| c.full_name } |
84 |
|
85 |
date_now = date.method_list.first |
86 |
- date_time_now = date_time.method_list.first |
87 |
+ date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first |
88 |
|
89 |
assert_equal :private, date_now.visibility |
90 |
assert_equal :public, date_time_now.visibility |
91 |
@@ -1876,10 +1878,11 @@ end |
92 |
|
93 |
@parser.parse_statements @top_level |
94 |
|
95 |
- date, date_time = @top_level.classes |
96 |
+ # TODO sort classes by default |
97 |
+ date, date_time = @top_level.classes.sort_by { |c| c.full_name } |
98 |
|
99 |
date_now = date.method_list.first |
100 |
- date_time_now = date_time.method_list.first |
101 |
+ date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first |
102 |
|
103 |
assert_equal :public, date_now.visibility, date_now.full_name |
104 |
assert_equal :private, date_time_now.visibility, date_time_now.full_name |