Skip to content

Commit e054fc2

Browse files
chrisseatonchrisseaton
committed
Tag failing bootstraptest
1 parent 83cf430 commit e054fc2

File tree

11 files changed

+77
-78
lines changed

11 files changed

+77
-78
lines changed

‎test/bootstraptest/test_eval.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class Integer
115115
1.instance_eval %{
116116
Const
117117
}
118-
}
118+
}, tagged: true
119119
assert_equal %q{top}, %q{
120120
Const = :top
121121
class C
@@ -196,7 +196,7 @@ def initialize &b
196196
rescue SyntaxError => e
197197
e.message
198198
end
199-
}, '[ruby-dev:31372]'
199+
}, '[ruby-dev:31372]', tagged: true
200200
end
201201

202202
assert_normal_exit %q{
@@ -275,7 +275,7 @@ def defd_using_instance_eval() :ok end
275275
def defd_using_instance_exec() :ok end
276276
}
277277
nil.defd_using_instance_exec
278-
}, '[ruby-core:28324]'
278+
}, '[ruby-core:28324]', tagged: true
279279

280280
assert_normal_exit %q{
281281
eval("", method(:proc).call {}.binding)
@@ -311,7 +311,7 @@ def kaboom!
311311
begin
312312
eval "class C; @@h = #{hash.inspect}; end"
313313
end
314-
}, '[ruby-core:25714]'
314+
}, '[ruby-core:25714]', tagged: true
315315

316316
assert_normal_exit %q{
317317
begin
@@ -320,5 +320,4 @@ def kaboom!
320320
p e
321321
RubyVM::InstructionSequence.compile("p:hello")
322322
end
323-
}, 'check escaping the internal value th->base_block'
324-
323+
}, 'check escaping the internal value th->base_block', tagged: true

‎test/bootstraptest/test_flow.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ class C
268268
end
269269
end; 3)
270270
)
271-
}
271+
}, tagged: true
272272
assert_equal %q{34}, %q{
273273
def m a, b
274274
a+b
@@ -283,7 +283,7 @@ class C; $a << 3
283283
end; $a << 5
284284
}; $a << 6
285285
; $a << 7
286-
; rescue Exception; $a << 99; end; $a}
286+
; rescue Exception; $a << 99; end; $a}, tagged: true
287287
assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
288288
3.times{; $a << 2
289289
class A; $a << 3
@@ -293,15 +293,15 @@ class B; $a << 4
293293
end; $a << 7
294294
}; $a << 8
295295
; $a << 9
296-
; rescue Exception; $a << 99; end; $a}
296+
; rescue Exception; $a << 99; end; $a}, tagged: true
297297
assert_equal %q{[1, 2, 3, 2, 3, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
298298
3.times{; $a << 2
299299
class C; $a << 3
300300
next; $a << 4
301301
end; $a << 5
302302
}; $a << 6
303303
; $a << 7
304-
; rescue Exception; $a << 99; end; $a}
304+
; rescue Exception; $a << 99; end; $a}, tagged: true
305305
assert_equal %q{[1, 2, 3, 4, 2, 3, 4, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
306306
3.times{; $a << 2
307307
class C; $a << 3
@@ -311,15 +311,15 @@ class D; $a << 4
311311
end; $a << 7
312312
}; $a << 8
313313
; $a << 9
314-
; rescue Exception; $a << 99; end; $a}
314+
; rescue Exception; $a << 99; end; $a}, tagged: true
315315
assert_equal %q{[1, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
316316
while true; $a << 2
317317
class C; $a << 3
318318
break; $a << 4
319319
end; $a << 5
320320
end; $a << 6
321321
; $a << 7
322-
; rescue Exception; $a << 99; end; $a}
322+
; rescue Exception; $a << 99; end; $a}, tagged: true
323323
assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
324324
while true; $a << 2
325325
class C; $a << 3
@@ -329,7 +329,7 @@ class D; $a << 4
329329
end; $a << 7
330330
end; $a << 8
331331
; $a << 9
332-
; rescue Exception; $a << 99; end; $a}
332+
; rescue Exception; $a << 99; end; $a}, tagged: true
333333
assert_equal %q{[1, 2, 3, 4, 5, 3, 4, 5, 3, 4, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
334334
i=0; $a << 2
335335
while i<3; $a << 3
@@ -339,7 +339,7 @@ class C; $a << 5
339339
end; $a << 7
340340
end; $a << 8
341341
; $a << 9
342-
; rescue Exception; $a << 99; end; $a}
342+
; rescue Exception; $a << 99; end; $a}, tagged: true
343343
assert_equal %q{1}, %q{
344344
1.times{
345345
while true
@@ -352,7 +352,7 @@ class C
352352
end
353353
end
354354
}
355-
}
355+
}, tagged: true
356356
assert_equal %q{[1, 2, 3, 5, 2, 3, 5, 7, 8]}, %q{$a = []; begin; ; $a << 1
357357
[1,2].each do; $a << 2
358358
begin; $a << 3

‎test/bootstraptest/test_insns.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def m&b
8787
[ 'putiseq', %q{ -> { true }.() }, ],
8888
[ 'putstring', %q{ "true" }, ],
8989
[ 'tostring / concatstrings', %q{ "#{true}" }, ],
90-
[ 'freezestring', %q{ "#{true}" }, fsl, ],
90+
[ 'freezestring', %q{ "#{true}" }, fsl, :tagged ],
9191
[ 'freezestring', %q{ "#{true}" }, '-d', fsl, ],
9292
[ 'toregexp', %q{ /#{true}/ =~ "true" && $~ }, ],
9393
[ 'intern', %q{ :"#{true}" }, ],
@@ -273,7 +273,7 @@ def once n
273273
x = once(128); x = once(7); x = once(16);
274274
x =~ "true" && $~
275275
},
276-
[ 'once', <<~'},', ], # {
276+
[ 'once', <<~'},', :tagged], # {
277277
# inter-thread lockup situation
278278
def once n
279279
return Thread.start n do |m|

‎test/bootstraptest/test_io.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
w << "ab"
3939
}
4040
r.gets("abab")
41-
}
41+
}, '', tagged: true
4242

4343
assert_equal 'ok', %q{
4444
require 'tmpdir'

‎test/bootstraptest/test_literal_suffix.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
assert_equal 'Complex', '1.2ri.class'
4242
assert_equal '0+10.0i', '1e1i'
4343
assert_equal 'Complex', '1e1i.class'
44-
assert_equal '1', '1if true'
45-
assert_equal '1', '1rescue nil'
44+
assert_equal '1', '1if true', tagged: true
45+
assert_equal '1', '1rescue nil', tagged: true
4646
assert_equal '10000000000000000001/10000000000000000000',
47-
'1.0000000000000000001r'
47+
'1.0000000000000000001r', tagged: true
4848

4949
assert_equal 'syntax error, unexpected tIDENTIFIER, expecting end-of-input',
50-
%q{begin eval('1ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
50+
%q{begin eval('1ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}, tagged: true
5151
assert_equal 'syntax error, unexpected tIDENTIFIER, expecting end-of-input',
52-
%q{begin eval('1.2ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
52+
%q{begin eval('1.2ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}, tagged: true
5353
assert_equal 'syntax error, unexpected tIDENTIFIER, expecting end-of-input',
54-
%q{begin eval('1e1r', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
54+
%q{begin eval('1e1r', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}, tagged: true

‎test/bootstraptest/test_load.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
}.map {|t| t.value }
1414
vs[0] == M && vs[1] == M ? :ok : :ng
15-
}, '[ruby-dev:32048]'
15+
}, '[ruby-dev:32048]', tagged: true
1616

1717
assert_equal 'ok', %q{
1818
%w[a a/foo b].each {|d| Dir.mkdir(d)}
@@ -24,4 +24,4 @@
2424
rescue => e
2525
e.message
2626
end
27-
}, '[ruby-dev:38097]'
27+
}, '[ruby-dev:38097]', tagged: true

‎test/bootstraptest/test_massign.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
trace_var(:$b){|v| ans << v}
1212
$a, $b = 1, 2
1313
ans
14-
}
14+
}, tagged: true
1515

1616
assert_equal 'ok', %q{
1717
r = :ok

‎test/bootstraptest/test_method.rb

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,14 @@ def foobar
243243
end
244244
undef :"foo#{:bar}"
245245
1
246-
}, '[ruby-dev:32308]'
246+
}, '[ruby-dev:32308]', tagged: true
247247
assert_equal '1', %q{
248248
def foobar
249249
1
250250
end
251251
alias :"bar#{:baz}" :"foo#{:bar}"
252252
barbaz
253-
}, '[ruby-dev:32308]'
253+
}, '[ruby-dev:32308]', tagged: true
254254

255255
# private
256256
assert_equal '1', %q( class C
@@ -356,7 +356,7 @@ def []=(a, b)
356356
C.new[:foo, &lambda{:ok1}]
357357
C.new[:foo, &lambda{:ok2}] = :bar
358358
$ary
359-
}
359+
}, tagged: true
360360

361361
# with
362362
assert_equal '[:ok1, [:ok2, 11]]', %q{
@@ -372,7 +372,7 @@ def []=(a)
372372
$ary = []
373373
C.new[]+=1
374374
$ary
375-
}
375+
}, tagged: true
376376

377377
# splat and block arguments
378378
assert_equal %q{[[[:x, :y, :z], NilClass], [[1, :x, :y, :z], NilClass], [[1, 2, :x, :y, :z], NilClass], [[:obj], NilClass], [[1, :obj], NilClass], [[1, 2, :obj], NilClass], [[], Proc], [[1], Proc], [[1, 2], Proc], [[], Proc], [[1], Proc], [[1, 2], Proc], [[:x, :y, :z], Proc], [[1, :x, :y, :z], Proc], [[1, 2, :x, :y, :z], Proc]]}, %q{
@@ -404,7 +404,7 @@ def m(*args, &b)
404404

405405
# aset and splat
406406
assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;Foo.new[1,*a=[2,3]]=4}
407-
assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;def m(&blk)Foo.new[1,*a=[2,3],&blk]=4;end;m{}}
407+
assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;def m(&blk)Foo.new[1,*a=[2,3],&blk]=4;end;m{}}, tagged: true
408408

409409
# post test
410410
assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, NilClass, nil, nil]}, %q{
@@ -676,17 +676,17 @@ def m a, o=:o, *r, &b
676676
assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
677677
class C0; def m *args; [:C0_m, args]; end; end
678678
class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
679-
; C1.new.m(1,2,3,4)}
679+
; C1.new.m(1,2,3,4)}, tagged: true
680680

681681
assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
682682
class C0; def m *args; [:C0_m, args]; end; end
683683
class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
684-
; C1.new.m(1,2,3,4,5)}
684+
; C1.new.m(1,2,3,4,5)}, tagged: true
685685

686686
assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
687687
class C0; def m *args; [:C0_m, args]; end; end
688688
class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
689-
; C1.new.m(1,2,3,4,5,6)}
689+
; C1.new.m(1,2,3,4,5,6)}, tagged: true
690690

691691
assert_equal %q{[:C0_m, [1, :o]]}, %q{
692692
class C0; def m *args; [:C0_m, args]; end; end
@@ -717,27 +717,27 @@ class C1 < C0; def m a
717717
assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
718718
class C0; def m *args; [:C0_m, args]; end; end
719719
class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
720-
; C1.new.m(1,2,3,4)}
720+
; C1.new.m(1,2,3,4)}, tagged: true
721721

722722
assert_equal %q{[:C0_m, [1, 2, 3, 4, 5]]}, %q{
723723
class C0; def m *args; [:C0_m, args]; end; end
724724
class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
725-
; C1.new.m(1,2,3,4,5)}
725+
; C1.new.m(1,2,3,4,5)}, tagged: true
726726

727727
assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
728728
class C0; def m *args; [:C0_m, args]; end; end
729729
class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
730-
; C1.new.m(1,2,3,4,5,6)}
730+
; C1.new.m(1,2,3,4,5,6)}, tagged: true
731731

732732
assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
733733
class C0; def m *args; [:C0_m, args]; end; end
734734
class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
735-
; C1.new.m(1,2,3,4,5,6,7)}
735+
; C1.new.m(1,2,3,4,5,6,7)}, tagged: true
736736

737737
assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
738738
class C0; def m *args; [:C0_m, args]; end; end
739739
class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
740-
; C1.new.m(1,2,3,4,5,6,7,8)}
740+
; C1.new.m(1,2,3,4,5,6,7,8)}, tagged: true
741741

742742
assert_equal %q{[:C0_m, [1, :o]]}, %q{
743743
class C0; def m *args; [:C0_m, args]; end; end
@@ -829,32 +829,32 @@ class C1 < C0; def m a, *r
829829
assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
830830
class C0; def m *args; [:C0_m, args]; end; end
831831
class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
832-
; C1.new.m(1,2,3,4)}
832+
; C1.new.m(1,2,3,4)}, tagged: true
833833

834834
assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
835835
class C0; def m *args; [:C0_m, args]; end; end
836836
class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
837-
; C1.new.m(1,2,3,4,5)}
837+
; C1.new.m(1,2,3,4,5)}, tagged: true
838838

839839
assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
840840
class C0; def m *args; [:C0_m, args]; end; end
841841
class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
842-
; C1.new.m(1,2,3,4,5,6)}
842+
; C1.new.m(1,2,3,4,5,6)}, tagged: true
843843

844844
assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
845845
class C0; def m *args; [:C0_m, args]; end; end
846846
class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
847-
; C1.new.m(1,2,3,4,5,6,7)}
847+
; C1.new.m(1,2,3,4,5,6,7)}, tagged: true
848848

849849
assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
850850
class C0; def m *args; [:C0_m, args]; end; end
851851
class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
852-
; C1.new.m(1,2,3,4,5,6,7,8)}
852+
; C1.new.m(1,2,3,4,5,6,7,8)}, tagged: true
853853

854854
assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8, 9]]}, %q{
855855
class C0; def m *args; [:C0_m, args]; end; end
856856
class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
857-
; C1.new.m(1,2,3,4,5,6,7,8,9)}
857+
; C1.new.m(1,2,3,4,5,6,7,8,9)}, tagged: true
858858

859859
assert_equal %q{[:C0_m, [1]]}, %q{
860860
class C0; def m *args; [:C0_m, args]; end; end
@@ -907,7 +907,7 @@ def m
907907
end
908908
}.call
909909
C.new.m
910-
}, '[ruby-core:11998]'
910+
}, '[ruby-core:11998]', tagged: true
911911

912912
assert_equal 'ok', %q{
913913
class B
@@ -925,7 +925,7 @@ class C < B
925925
rescue NameError
926926
:ok
927927
end
928-
}, '[ruby-dev:31816], [ruby-dev:31817]'
928+
}, '[ruby-dev:31816], [ruby-dev:31817]', tagged: true
929929

930930
assert_normal_exit %q{
931931
begin
@@ -989,7 +989,7 @@ def bar
989989
D.new.foo
990990
D.new.bar{}
991991
[C.new.foo, C.new.foo{}, D.new.m1, D.new.m1{}, D.new.m2, D.new.m2{}]
992-
}, '[ruby-core:14813]'
992+
}, '[ruby-core:14813]', tagged: true
993993

994994
assert_equal 'ok', %q{
995995
class Foo
@@ -1110,7 +1110,7 @@ class C
11101110
assert_equal 'ok', %q{
11111111
[0][0, &proc{}] += 21
11121112
'ok'
1113-
}, '[ruby-core:30534]'
1113+
}, '[ruby-core:30534]', tagged: true
11141114

11151115
# should not cache when splat
11161116
assert_equal 'ok', %q{
@@ -1189,4 +1189,4 @@ def test2 o, args, block
11891189
end
11901190
test2 o1, [], block
11911191
$result.join
1192-
}
1192+
}, tagged: true

0 commit comments

Comments
 (0)