File tree 1 file changed +11
-8
lines changed
src/tools/compiletest/src
1 file changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -3140,8 +3140,14 @@ impl<'test> TestCx<'test> {
3140
3140
output_kind : TestOutput ,
3141
3141
explicit_format : bool ,
3142
3142
) -> usize {
3143
+ let stderr_bits = format ! ( "{}.stderr" , get_pointer_width( & self . config. target) ) ;
3143
3144
let ( stderr_kind, stdout_kind) = match output_kind {
3144
- TestOutput :: Compile => ( UI_STDERR , UI_STDOUT ) ,
3145
+ TestOutput :: Compile => (
3146
+ {
3147
+ if self . props . stderr_per_bitwidth { & stderr_bits } else { UI_STDERR }
3148
+ } ,
3149
+ UI_STDOUT ,
3150
+ ) ,
3145
3151
TestOutput :: Run => ( UI_RUN_STDERR , UI_RUN_STDOUT ) ,
3146
3152
} ;
3147
3153
@@ -3181,15 +3187,12 @@ impl<'test> TestCx<'test> {
3181
3187
match output_kind {
3182
3188
TestOutput :: Compile => {
3183
3189
if !self . props . dont_check_compiler_stdout {
3184
- errors += self . compare_output ( "stdout" , & normalized_stdout, & expected_stdout) ;
3190
+ errors +=
3191
+ self . compare_output ( stdout_kind, & normalized_stdout, & expected_stdout) ;
3185
3192
}
3186
3193
if !self . props . dont_check_compiler_stderr {
3187
- let kind = if self . props . stderr_per_bitwidth {
3188
- format ! ( "{}.stderr" , get_pointer_width( & self . config. target) )
3189
- } else {
3190
- String :: from ( "stderr" )
3191
- } ;
3192
- errors += self . compare_output ( & kind, & normalized_stderr, & expected_stderr) ;
3194
+ errors +=
3195
+ self . compare_output ( stderr_kind, & normalized_stderr, & expected_stderr) ;
3193
3196
}
3194
3197
}
3195
3198
TestOutput :: Run => {
You can’t perform that action at this time.
0 commit comments