@@ -319,8 +319,7 @@ impl<'test> TestCx<'test> {
319
319
320
320
fn run_cfail_test ( & self ) {
321
321
let pm = self . pass_mode ( ) ;
322
- let proc_res =
323
- self . compile_test ( WillExecute :: No , self . should_emit_metadata ( pm) , Vec :: new ( ) ) ;
322
+ let proc_res = self . compile_test ( WillExecute :: No , self . should_emit_metadata ( pm) ) ;
324
323
self . check_if_test_should_compile ( & proc_res, pm) ;
325
324
self . check_no_compiler_crash ( & proc_res, self . props . should_ice ) ;
326
325
@@ -348,7 +347,7 @@ impl<'test> TestCx<'test> {
348
347
fn run_rfail_test ( & self ) {
349
348
let pm = self . pass_mode ( ) ;
350
349
let should_run = self . run_if_enabled ( ) ;
351
- let proc_res = self . compile_test ( should_run, self . should_emit_metadata ( pm) , Vec :: new ( ) ) ;
350
+ let proc_res = self . compile_test ( should_run, self . should_emit_metadata ( pm) ) ;
352
351
353
352
if !proc_res. status . success ( ) {
354
353
self . fatal_proc_rec ( "compilation failed!" , & proc_res) ;
@@ -396,7 +395,7 @@ impl<'test> TestCx<'test> {
396
395
397
396
fn run_cpass_test ( & self ) {
398
397
let emit_metadata = self . should_emit_metadata ( self . pass_mode ( ) ) ;
399
- let proc_res = self . compile_test ( WillExecute :: No , emit_metadata, Vec :: new ( ) ) ;
398
+ let proc_res = self . compile_test ( WillExecute :: No , emit_metadata) ;
400
399
401
400
if !proc_res. status . success ( ) {
402
401
self . fatal_proc_rec ( "compilation failed!" , & proc_res) ;
@@ -411,7 +410,7 @@ impl<'test> TestCx<'test> {
411
410
fn run_rpass_test ( & self ) {
412
411
let emit_metadata = self . should_emit_metadata ( self . pass_mode ( ) ) ;
413
412
let should_run = self . run_if_enabled ( ) ;
414
- let proc_res = self . compile_test ( should_run, emit_metadata, Vec :: new ( ) ) ;
413
+ let proc_res = self . compile_test ( should_run, emit_metadata) ;
415
414
416
415
if !proc_res. status . success ( ) {
417
416
self . fatal_proc_rec ( "compilation failed!" , & proc_res) ;
@@ -441,7 +440,7 @@ impl<'test> TestCx<'test> {
441
440
}
442
441
443
442
let should_run = self . run_if_enabled ( ) ;
444
- let mut proc_res = self . compile_test ( should_run, Emit :: None , Vec :: new ( ) ) ;
443
+ let mut proc_res = self . compile_test ( should_run, Emit :: None ) ;
445
444
446
445
if !proc_res. status . success ( ) {
447
446
self . fatal_proc_rec ( "compilation failed!" , & proc_res) ;
@@ -687,7 +686,7 @@ impl<'test> TestCx<'test> {
687
686
688
687
// compile test file (it should have 'compile-flags:-g' in the header)
689
688
let should_run = self . run_if_enabled ( ) ;
690
- let compile_result = self . compile_test ( should_run, Emit :: None , Vec :: new ( ) ) ;
689
+ let compile_result = self . compile_test ( should_run, Emit :: None ) ;
691
690
if !compile_result. status . success ( ) {
692
691
self . fatal_proc_rec ( "compilation failed!" , & compile_result) ;
693
692
}
@@ -807,7 +806,7 @@ impl<'test> TestCx<'test> {
807
806
808
807
// compile test file (it should have 'compile-flags:-g' in the header)
809
808
let should_run = self . run_if_enabled ( ) ;
810
- let compiler_run_result = self . compile_test ( should_run, Emit :: None , Vec :: new ( ) ) ;
809
+ let compiler_run_result = self . compile_test ( should_run, Emit :: None ) ;
811
810
if !compiler_run_result. status . success ( ) {
812
811
self . fatal_proc_rec ( "compilation failed!" , & compiler_run_result) ;
813
812
}
@@ -1044,7 +1043,7 @@ impl<'test> TestCx<'test> {
1044
1043
fn run_debuginfo_lldb_test_no_opt ( & self ) {
1045
1044
// compile test file (it should have 'compile-flags:-g' in the header)
1046
1045
let should_run = self . run_if_enabled ( ) ;
1047
- let compile_result = self . compile_test ( should_run, Emit :: None , Vec :: new ( ) ) ;
1046
+ let compile_result = self . compile_test ( should_run, Emit :: None ) ;
1048
1047
if !compile_result. status . success ( ) {
1049
1048
self . fatal_proc_rec ( "compilation failed!" , & compile_result) ;
1050
1049
}
@@ -1483,7 +1482,16 @@ impl<'test> TestCx<'test> {
1483
1482
}
1484
1483
}
1485
1484
1486
- fn compile_test ( & self , will_execute : WillExecute , emit : Emit , passes : Vec < String > ) -> ProcRes {
1485
+ fn compile_test ( & self , will_execute : WillExecute , emit : Emit ) -> ProcRes {
1486
+ self . compile_test_general ( will_execute, emit, self . props . local_pass_mode ( ) , Vec :: new ( ) )
1487
+ }
1488
+
1489
+ fn compile_test_with_passes (
1490
+ & self ,
1491
+ will_execute : WillExecute ,
1492
+ emit : Emit ,
1493
+ passes : Vec < String > ,
1494
+ ) -> ProcRes {
1487
1495
self . compile_test_general ( will_execute, emit, self . props . local_pass_mode ( ) , passes)
1488
1496
}
1489
1497
@@ -2791,7 +2799,7 @@ impl<'test> TestCx<'test> {
2791
2799
fn run_codegen_units_test ( & self ) {
2792
2800
assert ! ( self . revision. is_none( ) , "revisions not relevant here" ) ;
2793
2801
2794
- let proc_res = self . compile_test ( WillExecute :: No , Emit :: None , Vec :: new ( ) ) ;
2802
+ let proc_res = self . compile_test ( WillExecute :: No , Emit :: None ) ;
2795
2803
2796
2804
if !proc_res. status . success ( ) {
2797
2805
self . fatal_proc_rec ( "compilation failed!" , & proc_res) ;
@@ -3340,7 +3348,7 @@ impl<'test> TestCx<'test> {
3340
3348
let pm = self . pass_mode ( ) ;
3341
3349
let should_run = self . should_run ( pm) ;
3342
3350
let emit_metadata = self . should_emit_metadata ( pm) ;
3343
- let proc_res = self . compile_test ( should_run, emit_metadata, Vec :: new ( ) ) ;
3351
+ let proc_res = self . compile_test ( should_run, emit_metadata) ;
3344
3352
self . check_if_test_should_compile ( & proc_res, pm) ;
3345
3353
3346
3354
// if the user specified a format in the ui test
@@ -3523,7 +3531,7 @@ impl<'test> TestCx<'test> {
3523
3531
let emit_metadata = self . should_emit_metadata ( pm) ;
3524
3532
let passes = self . get_passes ( ) ;
3525
3533
3526
- let proc_res = self . compile_test ( should_run, emit_metadata, passes) ;
3534
+ let proc_res = self . compile_test_with_passes ( should_run, emit_metadata, passes) ;
3527
3535
self . check_mir_dump ( ) ;
3528
3536
if !proc_res. status . success ( ) {
3529
3537
self . fatal_proc_rec ( "compilation failed!" , & proc_res) ;
0 commit comments