@@ -24,7 +24,7 @@ use rustc_lint;
24
24
use rustc:: session:: { self , config} ;
25
25
use rustc:: session:: config:: get_unstable_features_setting;
26
26
use rustc:: session:: search_paths:: { SearchPaths , PathKind } ;
27
- use rustc_driver:: { driver, Compilation } ;
27
+ use rustc_driver:: { driver, CompilerCalls , RustcDefaultCalls } ;
28
28
use syntax:: codemap:: CodeMap ;
29
29
use syntax:: diagnostic;
30
30
@@ -117,15 +117,16 @@ fn runtest(test: &str, cratename: &str, libs: SearchPaths,
117
117
let sessopts = config:: Options {
118
118
maybe_sysroot : Some ( os:: self_exe_name ( ) . unwrap ( ) . dir_path ( ) . dir_path ( ) ) ,
119
119
search_paths : libs,
120
- crate_types : vec ! ( config:: CrateTypeExecutable ) ,
121
- output_types : vec ! ( config:: OutputTypeExe ) ,
120
+ crate_types : vec ! [ config:: CrateTypeExecutable ] ,
121
+ output_types : vec ! [ config:: OutputTypeExe ] ,
122
122
externs : externs,
123
123
cg : config:: CodegenOptions {
124
124
prefer_dynamic : true ,
125
125
.. config:: basic_codegen_options ( )
126
126
} ,
127
127
test : as_test_harness,
128
128
unstable_features : get_unstable_features_setting ( ) ,
129
+ no_trans : no_run,
129
130
..config:: basic_options ( ) . clone ( )
130
131
} ;
131
132
@@ -173,10 +174,7 @@ fn runtest(test: &str, cratename: &str, libs: SearchPaths,
173
174
let out = Some ( outdir. path ( ) . clone ( ) ) ;
174
175
let cfg = config:: build_configuration ( & sess) ;
175
176
let libdir = sess. target_filesearch ( PathKind :: All ) . get_lib_path ( ) ;
176
- let mut control = driver:: CompileController :: basic ( ) ;
177
- if no_run {
178
- control. after_analysis . stop = Compilation :: Stop ;
179
- }
177
+ let control = RustcDefaultCalls :: new ( ) . build_controller ( & sess) ;
180
178
driver:: compile_input ( sess, cfg, & input, & out, & None , None , control) ;
181
179
182
180
if no_run { return }
0 commit comments