@@ -2073,12 +2073,11 @@ mod snapshot {
2073
2073
ctx. config( "clippy" )
2074
2074
. path( "ci" )
2075
2075
. render_steps( ) , @r"
2076
+ [clippy] rustc 0 <host> -> bootstrap 1 <host>
2076
2077
[build] llvm <host>
2077
2078
[build] rustc 0 <host> -> rustc 1 <host>
2078
- [check] rustc 1 <host> -> rustc 2 <host>
2079
2079
[build] rustc 0 <host> -> clippy-driver 1 <host>
2080
2080
[build] rustc 0 <host> -> cargo-clippy 1 <host>
2081
- [clippy] bootstrap <host>
2082
2081
[clippy] rustc 1 <host> -> std 1 <host>
2083
2082
[clippy] rustc 0 <host> -> rustc 1 <host>
2084
2083
[clippy] rustc 0 <host> -> rustc_codegen_gcc 1 <host>
@@ -2096,21 +2095,20 @@ mod snapshot {
2096
2095
[build] llvm <host>
2097
2096
[build] rustc 0 <host> -> rustc 1 <host>
2098
2097
[build] rustc 1 <host> -> std 1 <host>
2098
+ [build] rustc 0 <host> -> clippy-driver 1 <host>
2099
+ [build] rustc 0 <host> -> cargo-clippy 1 <host>
2100
+ [clippy] rustc 1 <host> -> bootstrap 2 <host>
2099
2101
[build] rustc 1 <host> -> rustc 2 <host>
2100
- [check] rustc 2 <host> -> rustc 3 <host>
2101
2102
[build] rustc 1 <host> -> clippy-driver 2 <host>
2102
2103
[build] rustc 1 <host> -> cargo-clippy 2 <host>
2103
- [clippy] bootstrap <host>
2104
2104
[clippy] rustc 2 <host> -> std 2 <host>
2105
- [build] rustc 0 <host> -> clippy-driver 1 <host>
2106
- [build] rustc 0 <host> -> cargo-clippy 1 <host>
2107
2105
[clippy] rustc 1 <host> -> rustc 2 <host>
2108
2106
[clippy] rustc 1 <host> -> rustc_codegen_gcc 2 <host>
2109
2107
" ) ;
2110
2108
}
2111
2109
2112
2110
#[ test]
2113
- fn clippy_compiler ( ) {
2111
+ fn clippy_compiler_stage1 ( ) {
2114
2112
let ctx = TestCtx :: new ( ) ;
2115
2113
insta:: assert_snapshot!(
2116
2114
ctx. config( "clippy" )
@@ -2122,7 +2120,24 @@ mod snapshot {
2122
2120
}
2123
2121
2124
2122
#[ test]
2125
- fn clippy_std ( ) {
2123
+ fn clippy_compiler_stage2 ( ) {
2124
+ let ctx = TestCtx :: new ( ) ;
2125
+ insta:: assert_snapshot!(
2126
+ ctx. config( "clippy" )
2127
+ . path( "compiler" )
2128
+ . stage( 2 )
2129
+ . render_steps( ) , @r"
2130
+ [build] llvm <host>
2131
+ [build] rustc 0 <host> -> rustc 1 <host>
2132
+ [build] rustc 1 <host> -> std 1 <host>
2133
+ [build] rustc 0 <host> -> clippy-driver 1 <host>
2134
+ [build] rustc 0 <host> -> cargo-clippy 1 <host>
2135
+ [clippy] rustc 1 <host> -> rustc 2 <host>
2136
+ " ) ;
2137
+ }
2138
+
2139
+ #[ test]
2140
+ fn clippy_std_stage1 ( ) {
2126
2141
let ctx = TestCtx :: new ( ) ;
2127
2142
insta:: assert_snapshot!(
2128
2143
ctx. config( "clippy" )
@@ -2135,6 +2150,65 @@ mod snapshot {
2135
2150
[clippy] rustc 1 <host> -> std 1 <host>
2136
2151
" ) ;
2137
2152
}
2153
+
2154
+ #[ test]
2155
+ fn clippy_std_stage2 ( ) {
2156
+ let ctx = TestCtx :: new ( ) ;
2157
+ insta:: assert_snapshot!(
2158
+ ctx. config( "clippy" )
2159
+ . path( "std" )
2160
+ . stage( 2 )
2161
+ . render_steps( ) , @r"
2162
+ [build] llvm <host>
2163
+ [build] rustc 0 <host> -> rustc 1 <host>
2164
+ [build] rustc 1 <host> -> std 1 <host>
2165
+ [build] rustc 1 <host> -> rustc 2 <host>
2166
+ [build] rustc 1 <host> -> clippy-driver 2 <host>
2167
+ [build] rustc 1 <host> -> cargo-clippy 2 <host>
2168
+ [clippy] rustc 2 <host> -> std 2 <host>
2169
+ " ) ;
2170
+ }
2171
+
2172
+ #[ test]
2173
+ fn clippy_miri_stage1 ( ) {
2174
+ let ctx = TestCtx :: new ( ) ;
2175
+ insta:: assert_snapshot!(
2176
+ ctx. config( "clippy" )
2177
+ . path( "miri" )
2178
+ . stage( 1 )
2179
+ . render_steps( ) , @r"
2180
+ [build] llvm <host>
2181
+ [check] rustc 0 <host> -> rustc 1 <host>
2182
+ [clippy] rustc 0 <host> -> miri 1 <host>
2183
+ " ) ;
2184
+ }
2185
+
2186
+ #[ test]
2187
+ fn clippy_miri_stage2 ( ) {
2188
+ let ctx = TestCtx :: new ( ) ;
2189
+ insta:: assert_snapshot!(
2190
+ ctx. config( "clippy" )
2191
+ . path( "miri" )
2192
+ . stage( 2 )
2193
+ . render_steps( ) , @r"
2194
+ [build] llvm <host>
2195
+ [build] rustc 0 <host> -> rustc 1 <host>
2196
+ [build] rustc 1 <host> -> std 1 <host>
2197
+ [check] rustc 1 <host> -> rustc 2 <host>
2198
+ [build] rustc 0 <host> -> clippy-driver 1 <host>
2199
+ [build] rustc 0 <host> -> cargo-clippy 1 <host>
2200
+ [clippy] rustc 1 <host> -> miri 2 <host>
2201
+ " ) ;
2202
+ }
2203
+
2204
+ #[ test]
2205
+ fn clippy_bootstrap ( ) {
2206
+ let ctx = TestCtx :: new ( ) ;
2207
+ insta:: assert_snapshot!(
2208
+ ctx. config( "clippy" )
2209
+ . path( "bootstrap" )
2210
+ . render_steps( ) , @"[clippy] rustc 0 <host> -> bootstrap 1 <host>" ) ;
2211
+ }
2138
2212
}
2139
2213
2140
2214
struct ExecutedSteps {
0 commit comments