@@ -47,15 +47,74 @@ def run_spec_test(test_case, options = {})
47
47
if test_case . verify_stderr?
48
48
# Compare only first line of error output (we can't compare stacktraces etc.)
49
49
begin
50
+ skip = false
50
51
error_lines = error . each_line
51
- error_msg = error_lines . next . rstrip
52
- if ( error_msg =~ /DEPRECATION WARNING:? on line/ )
53
- error_msg = error_lines . next . rstrip
52
+ while error_line = error_lines . next do
53
+ if ( error_line =~ /DEPRECATION WARNING/ )
54
+ skip = false
55
+ end
56
+ if ( error_line =~ /Error:/ )
57
+ skip = false
58
+ end
59
+ # disable once we support this deprecation fully
60
+ if ( error_line =~ /interpolation near operators will be simplified/ )
61
+ skip = true
62
+ next
63
+ end
64
+ # disable once we support this deprecation fully
65
+ # if (error_line =~ /The subject selector operator \"!\" is deprecated and will be removed/)
66
+ # skip = true
67
+ # next
68
+ # end
69
+ # disable once we support this deprecation fully
70
+ if ( error_line =~ /Passing a percentage as the alpha/ )
71
+ skip = true
72
+ next
73
+ end
74
+ # disable once we support this deprecation fully (partial now)
75
+ # if (error_line =~ /, a non-string value, to unquote()/)
76
+ # skip = true
77
+ # next
78
+ # end
79
+ if ( skip )
80
+ next
81
+ end
82
+ error_msg = error_line . rstrip
83
+ break
54
84
end
55
85
expected_error_lines = test_case . expected_error . each_line
56
- expected_error_msg = expected_error_lines . next . rstrip
57
- if ( expected_error_msg =~ /DEPRECATION WARNING:? on line/ )
58
- expected_error_msg = expected_error_lines . next . rstrip
86
+ while expected_error_line = expected_error_lines . next do
87
+ if ( expected_error_line =~ /DEPRECATION WARNING/ )
88
+ skip = false
89
+ end
90
+ if ( expected_error_line =~ /Error:/ )
91
+ skip = false
92
+ end
93
+ # disable once we support this deprecation fully
94
+ if ( expected_error_line =~ /interpolation near operators will be simplified/ )
95
+ skip = true
96
+ next
97
+ end
98
+ # disable once we support this deprecation fully
99
+ # if (expected_error_line =~ /The subject selector operator \"!\" is deprecated and will be removed/)
100
+ # skip = true
101
+ # next
102
+ # end
103
+ # disable once we support this deprecation fully
104
+ if ( expected_error_line =~ /Passing a percentage as the alpha/ )
105
+ skip = true
106
+ next
107
+ end
108
+ # disable once we support this deprecation fully (partial now)
109
+ # if (expected_error_line =~ /, a non-string value, to unquote()/)
110
+ # skip = true
111
+ # next
112
+ # end
113
+ if ( skip )
114
+ next
115
+ end
116
+ expected_error_msg = expected_error_line . rstrip
117
+ break
59
118
end
60
119
error_msg = _clean_debug_path ( error_msg )
61
120
expected_error_msg = _clean_debug_path ( expected_error_msg )
0 commit comments