File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -175,9 +175,11 @@ fn integration_test_rustc() {
175
175
. strip_prefix ( "commit-hash: " )
176
176
. expect ( "failed parsing commit line" ) ;
177
177
178
+ dbg ! ( & commit) ;
178
179
// check out the commit in the rustc repo to ensure clippy is compatible
179
180
180
181
let st_git_checkout = Command :: new ( "git" )
182
+ . current_dir ( & repo_dir)
181
183
. arg ( "checkout" )
182
184
. arg ( commit)
183
185
. status ( )
@@ -186,15 +188,15 @@ fn integration_test_rustc() {
186
188
187
189
let root_dir = std:: path:: PathBuf :: from ( env ! ( "CARGO_MANIFEST_DIR" ) ) ;
188
190
let target_dir = std:: path:: Path :: new ( & root_dir) . join ( "target" ) ;
189
- let clippy_binary = target_dir. join ( env ! ( "PROFILE" ) ) . join ( CARGO_CLIPPY ) ;
191
+ // let clippy_binary = target_dir.join(env!("PROFILE")).join(CARGO_CLIPPY);
190
192
191
193
// we need to make sure that `x.py clippy` picks up our self-built clippy
192
194
// try to make the target dir discoverable as PATH
193
195
194
196
let path_env = target_dir. join ( env ! ( "PROFILE" ) ) ;
195
197
196
198
let output = Command :: new ( "x.py" )
197
- . current_dir ( "rust" )
199
+ . current_dir ( & repo_dir )
198
200
. env ( "RUST_BACKTRACE" , "full" )
199
201
. env ( "PATH" , path_env)
200
202
. args ( [ "clippy" , "-Wclippy::pedantic" , "-Wclippy::nursery" ] )
You can’t perform that action at this time.
0 commit comments