Skip to content

Commit a7c6d01

Browse files
authored
Merge pull request #264 from tamird/fix-build-nightly
Add new fields for internal test crate
2 parents db4cc7a + ce60f24 commit a7c6d01

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

src/lib.rs

+16-2
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
148148
shuffle: false,
149149
#[cfg(feature = "rustc")]
150150
shuffle_seed: None,
151+
#[cfg(feature = "rustc")]
152+
fail_fast: false,
151153
}
152154
}
153155

@@ -287,6 +289,16 @@ pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn
287289
test_type: test::TestType::IntegrationTest,
288290
#[cfg(feature = "rustc")]
289291
ignore_message: None,
292+
#[cfg(feature = "rustc")]
293+
source_file: "",
294+
#[cfg(feature = "rustc")]
295+
start_line: 0,
296+
#[cfg(feature = "rustc")]
297+
start_col: 0,
298+
#[cfg(feature = "rustc")]
299+
end_line: 0,
300+
#[cfg(feature = "rustc")]
301+
end_col: 0,
290302
},
291303
testfn: make_test_closure(config, testpaths),
292304
}
@@ -319,8 +331,10 @@ pub fn make_test_closure(config: &Config, testpaths: &TestPaths) -> test::TestFn
319331
let config = config.clone();
320332
let testpaths = testpaths.clone();
321333
test::DynTestFn(Box::new(move || {
322-
let config = config.clone(); // FIXME: why is this needed?
323-
runtest::run(config, &testpaths)
334+
let result = runtest::run(config, &testpaths);
335+
#[cfg(feature = "rustc")]
336+
let result = Ok(result);
337+
result
324338
}))
325339
}
326340

0 commit comments

Comments
 (0)